May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-ncurses
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Wed May 31 02:58:57 CEST 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-05-22 11:55:58.000000000 +0200 +++ yast2-ncurses/yast2-ncurses.changes 2006-05-30 11:59:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 30 11:57:06 CEST 2006 - gs(a)suse.de + +- Added support for licenses for patches (bug #174476) +- 2.13.35 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.13.34.tar.bz2 New: ---- yast2-ncurses-2.13.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.R0Vw68/_old 2006-05-31 02:58:39.000000000 +0200 +++ /var/tmp/diff_new_pack.R0Vw68/_new 2006-05-31 02:58:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.34) +# spec file for package yast2-ncurses (Version 2.13.35) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.13.34 +Version: 2.13.35 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.34.tar.bz2 +Source0: yast2-ncurses-2.13.35.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -41,7 +41,7 @@ %prep -%setup -n yast2-ncurses-2.13.34 +%setup -n yast2-ncurses-2.13.35 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,9 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Tue May 30 2006 - gs(a)suse.de +- Added support for licenses for patches (bug #174476) +- 2.13.35 * Mon May 22 2006 - gs(a)suse.de - Check whether the window pointer is valid in ::wCreate to prevent a segfault if the terminal is too small ++++++ yast2-ncurses-2.13.34.tar.bz2 -> yast2-ncurses-2.13.35.tar.bz2 ++++++ ++++ 7982 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/VERSION new/yast2-ncurses-2.13.35/VERSION --- old/yast2-ncurses-2.13.34/VERSION 2006-05-22 11:56:07.000000000 +0200 +++ new/yast2-ncurses-2.13.35/VERSION 2006-05-30 11:59:09.000000000 +0200 @@ -1 +1 @@ -2.13.34 +2.13.35 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/configure.in new/yast2-ncurses-2.13.35/configure.in --- old/yast2-ncurses-2.13.34/configure.in 2006-05-16 22:44:11.000000000 +0200 +++ new/yast2-ncurses-2.13.35/configure.in 2006-05-30 09:51:28.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.13.30, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.13.34, http://bugs.opensuse.org/, yast2-ncurses) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.30" +VERSION="2.13.34" RPMNAME="yast2-ncurses" MAINTAINER="Martin Lazar <mlazar(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/src/NCPkgTable.cc new/yast2-ncurses-2.13.35/src/NCPkgTable.cc --- old/yast2-ncurses-2.13.34/src/NCPkgTable.cc 2006-05-16 18:58:02.000000000 +0200 +++ new/yast2-ncurses-2.13.35/src/NCPkgTable.cc 2006-05-30 09:20:11.000000000 +0200 @@ -239,27 +239,14 @@ notify = objPtr->insnotify(); NCDBG << "NOTIFY message: " << notify << endl; header = YCPString(PkgNames::NotifyLabel()); - - // get license (available for packages only) - pkgPtr = tryCastToZyppPkg (objPtr); - if ( pkgPtr ) - { - license = pkgPtr->licenseToConfirm(); - license_confirmed = slbPtr->hasLicenceConfirmed(); - } } - break; case S_AutoInstall: case S_AutoUpdate: if ( objPtr ) { - // check license in case of S_AutoInstall/Update, too - pkgPtr = tryCastToZyppPkg (objPtr); - if ( pkgPtr ) - { - license = pkgPtr->licenseToConfirm(); - license_confirmed = slbPtr->hasLicenceConfirmed(); - } + // check license of packages and patches in case of S_Install/S_Update/S_AutoInstall/S_AutoUpdate + license = objPtr->licenseToConfirm(); + license_confirmed = slbPtr->hasLicenceConfirmed(); } break; @@ -270,12 +257,14 @@ if ( !license.empty() ) { - if (!license_confirmed) { + if (!license_confirmed) + { NCPopupInfo info( wpos( 1, 1), - YCPString(_("End User License Agreement") ), - YCPString( "" + pkgName + " " + packager->createDescrText( license ) ), - PkgNames::AcceptLabel(), - PkgNames::CancelLabel() ); + PkgNames::NotifyLabel(), + //YCPString(_("End User License Agreement") ), + YCPString( "" + pkgName + " " + packager->createDescrText( license ) ), + PkgNames::AcceptLabel(), + PkgNames::CancelLabel() ); license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; } @@ -300,6 +289,7 @@ ok = false; } else { + NCMIL << "User confirmed license agreement for " << pkgName << endl; slbPtr->setLicenceConfirmed (true); } } @@ -354,51 +344,6 @@ return ok; } -bool NCPkgTable::showLicenseAgreement( ZyppSel & slbPtr , string licenseText ) -{ - if ( !packager || !slbPtr ) - return false; - - bool license_confirmed = true; - bool ok = true; - string pkgName = slbPtr->name(); - - NCPopupInfo info( wpos( 1, 1), - YCPString(_("End User License Agreement") ), - YCPString( "" + pkgName + " " + packager->createDescrText( licenseText ) ), - PkgNames::AcceptLabel(), - PkgNames::CancelLabel() ); - license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; - - - if ( !license_confirmed ) - { - // make sure the package won't be installed - switch ( slbPtr->status() ) - { - case S_Install: - case S_AutoInstall: - slbPtr->set_status( S_Taboo ); - break; - - case S_Update: - case S_AutoUpdate: - slbPtr->set_status( S_Protected ); - break; - - default: - break; - } - - ok = false; - } else { - slbPtr->setLicenceConfirmed (true); - ok = true; - } - - return ok; -} - /////////////////////////////////////////////////////////////////// // // diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/src/NCPkgTable.h new/yast2-ncurses-2.13.35/src/NCPkgTable.h --- old/yast2-ncurses-2.13.34/src/NCPkgTable.h 2006-05-16 11:08:53.000000000 +0200 +++ new/yast2-ncurses-2.13.35/src/NCPkgTable.h 2006-05-30 09:06:39.000000000 +0200 @@ -316,11 +316,7 @@ */ bool showInformation ( ); - /** - * Show popup with license. - * @return bool - */ - bool showLicenseAgreement( ZyppSel & slbPtr , string licenseText ); + }; /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/src/PackageSelector.cc new/yast2-ncurses-2.13.35/src/PackageSelector.cc --- old/yast2-ncurses-2.13.34/src/PackageSelector.cc 2006-05-19 12:33:10.000000000 +0200 +++ new/yast2-ncurses-2.13.35/src/PackageSelector.cc 2006-05-30 11:46:33.000000000 +0200 @@ -1889,7 +1889,7 @@ bool closeDialog = true; bool confirmedAllLicenses = false; - // check/show dependencies and automatic changes also if youMode == true + // check/show dependencies also if youMode == true do { // show the dependency popup @@ -1965,20 +1965,25 @@ } } - bool PackageSelector::showPendingLicenseAgreements() { + bool allConfirmed = true; + + if ( youMode ) + allConfirmed = showPendingLicenseAgreements( zyppPatchesBegin(), zyppPatchesEnd() ); + + allConfirmed = showPendingLicenseAgreements( zyppPkgBegin(), zyppPkgEnd() ) && allConfirmed; + + return allConfirmed; +} + +bool PackageSelector::showPendingLicenseAgreements( ZyppPoolIterator begin, ZyppPoolIterator end ) +{ y2milestone( "Showing all pending license agreements" ); bool allConfirmed = true; - NCPkgTable * packageList = getPackageList(); - if ( !packageList ) - return false; - - for ( ZyppPoolIterator it = zyppPkgBegin(); - it != zyppPkgEnd(); - ++it ) + for ( ZyppPoolIterator it = begin; it != end; ++it ) { ZyppSel sel = (*it); @@ -1991,25 +1996,19 @@ if ( sel->candidateObj() ) { - ZyppPkg pkg = tryCastToZyppPkg( sel->candidateObj() ); + string licenseText = sel->candidateObj()->licenseToConfirm(); - if ( pkg ) + if ( ! licenseText.empty() ) { - string licenseText = pkg->licenseToConfirm(); + y2milestone( "Package/Patch %s has a license agreement", sel->name().c_str() ); - if ( ! licenseText.empty() ) + if( ! sel->hasLicenceConfirmed() ) { - y2milestone( "Pkg %s has a license agreement", sel->name().c_str() ); - - if( ! sel->hasLicenceConfirmed() ) - { - y2debug( "Showing license agreement for pkg %s", sel->name().c_str() ); - allConfirmed = packageList->showLicenseAgreement( sel, licenseText ) && allConfirmed; - } - else - { - y2milestone( "Pkg %s's license is already confirmed", sel->name().c_str() ); - } + allConfirmed = showLicenseAgreement( sel, licenseText ) && allConfirmed; + } + else + { + y2milestone( "Package/Patch %s's license is already confirmed", sel->name().c_str() ); } } } @@ -2023,6 +2022,51 @@ return allConfirmed; } +bool PackageSelector::showLicenseAgreement( ZyppSel & slbPtr , string licenseText ) +{ + if ( !slbPtr ) + return false; + + bool license_confirmed = true; + bool ok = true; + string pkgName = slbPtr->name(); + + NCPopupInfo info( wpos( 1, 1), + PkgNames::NotifyLabel(), + YCPString( "" + pkgName + " " + createDescrText( licenseText ) ), + PkgNames::AcceptLabel(), + PkgNames::CancelLabel() ); + license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; + + + if ( !license_confirmed ) + { + // make sure the package won't be installed + switch ( slbPtr->status() ) + { + case S_Install: + case S_AutoInstall: + slbPtr->set_status( S_Taboo ); + break; + + case S_Update: + case S_AutoUpdate: + slbPtr->set_status( S_Protected ); + break; + + default: + break; + } + + ok = false; + } else { + NCMIL << "User confirmed license agreement for " << pkgName << endl; + slbPtr->setLicenceConfirmed (true); + ok = true; + } + + return ok; +} /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.34/src/PackageSelector.h new/yast2-ncurses-2.13.35/src/PackageSelector.h --- old/yast2-ncurses-2.13.34/src/PackageSelector.h 2006-05-17 12:44:48.000000000 +0200 +++ new/yast2-ncurses-2.13.35/src/PackageSelector.h 2006-05-30 09:06:38.000000000 +0200 @@ -406,8 +406,15 @@ /** * Check for license */ - bool showPendingLicenseAgreements(); + bool showPendingLicenseAgreements(); + bool showPendingLicenseAgreements( ZyppPoolIterator begin, ZyppPoolIterator end ); + /** + * Show popup with license. + * @return bool + */ + bool showLicenseAgreement( ZyppSel & slbPtr , string licenseText ); + void createFilterMenu(); }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-packager
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package yast2-packager checked in at Wed May 31 02:58:56 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-05-25 17:50:20.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-05-30 16:31:26.000000000 +0200 @@ -1,0 +2,15 @@ +Tue May 30 16:07:38 CEST 2006 - jsrain(a)suse.cz + +- fixed installation into directory (preselect patterns, don't ask + about base selection if pattern-based installation) (#177917) +- 2.13.122 + +------------------------------------------------------------------- +Tue May 30 08:46:50 CEST 2006 - locilka(a)suse.cz + +- Reimplementing the "Do Not Show Again" popups to store this flag + permanently. It stores URL + dialog type + default return + value (#175845). +- 2.13.121 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.120.tar.bz2 New: ---- yast2-packager-2.13.122.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.JB1JkU/_old 2006-05-31 02:58:46.000000000 +0200 +++ /var/tmp/diff_new_pack.JB1JkU/_new 2006-05-31 02:58:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.120) +# spec file for package yast2-packager (Version 2.13.122) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.120 +Version: 2.13.122 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.120.tar.bz2 +Source0: yast2-packager-2.13.122.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -43,7 +43,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.120 +%setup -n yast2-packager-2.13.122 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,15 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Tue May 30 2006 - jsrain(a)suse.cz +- fixed installation into directory (preselect patterns, don't ask + about base selection if pattern-based installation) (#177917) +- 2.13.122 +* Tue May 30 2006 - locilka(a)suse.cz +- Reimplementing the "Do Not Show Again" popups to store this flag + permanently. It stores URL + dialog type + default return + value (#175845). +- 2.13.121 * Thu May 25 2006 - mvidner(a)suse.cz - Use Pkg::SourceSaveAll which always saves even if no sources are enabled (#176013). ++++++ yast2-packager-2.13.120.tar.bz2 -> yast2-packager-2.13.122.tar.bz2 ++++++ ++++ 6814 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/VERSION new/yast2-packager-2.13.122/VERSION --- old/yast2-packager-2.13.120/VERSION 2006-05-25 17:49:19.000000000 +0200 +++ new/yast2-packager-2.13.122/VERSION 2006-05-30 16:14:24.000000000 +0200 @@ -1 +1 @@ -2.13.120 +2.13.122 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/configure.in new/yast2-packager-2.13.122/configure.in --- old/yast2-packager-2.13.120/configure.in 2006-05-25 18:10:32.000000000 +0200 +++ new/yast2-packager-2.13.122/configure.in 2006-05-30 16:30:08.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.120, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.122, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.120" +VERSION="2.13.122" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/clients/dirinstall.ycp new/yast2-packager-2.13.122/src/clients/dirinstall.ycp --- old/yast2-packager-2.13.120/src/clients/dirinstall.ycp 2006-04-19 12:59:38.000000000 +0200 +++ new/yast2-packager-2.13.122/src/clients/dirinstall.ycp 2006-05-30 15:52:52.000000000 +0200 @@ -9,7 +9,13 @@ { textdomain "packager"; + import "DirInstall"; import "PackageLock"; + import "Product"; + import "Report"; + + include "dirinstall/ui.ycp"; + // check whether having the packager for ourselves if (! PackageLock::Check ()) return `abort; @@ -19,14 +25,84 @@ PackageCallbacksInit::InitPackageCallbacks(); // initializa the package manager + integer old_src = -1; + integer new_src = -1; + boolean using_patterns = false; + Pkg::TargetFinish (); Pkg::SourceStartManager(true); + boolean have_patterns + = size (Pkg::ResolvableProperties ("", `pattern, "")) > 0; + boolean have_selections + = size (Pkg::GetSelections (`available, "base")) > 0; + have_patterns = have_patterns && ! have_selections; + if (have_patterns) + { + y2milestone ("Host system is using patterns"); + Pkg::TargetInit ("/", false); + list<map<string,any> > prods = Pkg::ResolvableProperties ("", `product, ""); + list<map<string,any> > base_l = filter (map<string,any> p, prods, { + return p["category"]:"" == "base"; + }); + map<string,any> base = base_l[0]:$[]; + if (size (base_l) == 0) + { + y2warning ("No base product found, using first found product"); + base = prods[0]:$[]; + } + y2milestone ("Found base product: %1", base); + prods = Pkg::ResolvableProperties (base["name"]:"", `product, ""); + y2milestone ("Found appropriate base products in sources: %1", prods); + if (size (prods) == 0) + { + // error report + Report::Error (_("Could not read package information.")); + return `abort; + } + map<string,any> prod = prods[0]:$[]; + integer source = prod["source"]:-1; + map src_data = Pkg::SourceGeneralData (source); + Pkg::SourceSetEnabled (source, false); + string url = src_data["url"]:""; + string dir = src_data["product_dir"]:"/"; + if (substring (url, 0, 3) == "cd:" || substring (url, 0, 4) == "dvd:") + { + if (! Popup::ContinueCancel (sformat (_("Insert %1 CD 1"), base["summary"]:""))) + return `back; + } + new_src = Pkg::SourceCreateBase (url, dir); + old_src = source; + using_patterns = true; - import "DirInstall"; - include "dirinstall/ui.ycp"; + string content_file = Pkg::SourceProvideFile (new_src, 1, "/content"); + SCR::RegisterAgent (.media.content, `ag_ini( + `IniAgent( content_file, + $[ + "options" : [ "read_only", "global_values", "flat" ], + "comments" : [ "^#.*", "^[ \t]*$", ], + "params" : [ + $[ "match" : [ "^[ \t]*([a-zA-Z0-9_\.]+)[ \t]*(.*)[ \t]*$", "%s %s" ] ] + ] + ] + ))); + any tmp1 = SCR::Read (.media.content.PATTERNS); + if (tmp1 != nil) + Product::patterns = splitstring ((string)tmp1, " "); + y2milestone ("***Patterns: %1", Product::patterns); + Pkg::TargetFinish (); + } + else + { + y2milestone ("Host system is using selections"); + } symbol ret = Run (); y2milestone ("Sequence returned %1", ret); DirInstall::UmountFilesystems (); + if (using_patterns) + { + Pkg::SourceDelete (new_src); + Pkg::SourceSetEnabled (old_src, true); + } DirInstall::FinishPackageManager (); return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/clients/inst_dirinstall_finish.ycp new/yast2-packager-2.13.122/src/clients/inst_dirinstall_finish.ycp --- old/yast2-packager-2.13.120/src/clients/inst_dirinstall_finish.ycp 2006-04-27 16:45:08.000000000 +0200 +++ new/yast2-packager-2.13.122/src/clients/inst_dirinstall_finish.ycp 2006-05-30 16:12:59.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Anas Nashif <nashif(a)suse.de> * - * $Id: inst_dirinstall_finish.ycp 30518 2006-04-27 06:24:33Z lslezak $ + * $Id: inst_dirinstall_finish.ycp 31191 2006-05-30 14:12:50Z jsrain $ * */ { @@ -106,6 +106,8 @@ } ); + // Stop SCR on target + WFM::SCRClose (Installation::scr_handle); // umount /proc and /sys before creating image (otherwise tar may fail) DirInstall::UmountFilesystems (); @@ -123,9 +125,6 @@ WFM::Execute(.local.bash, cmd); } - // Stop SCR on target - WFM::SCRClose (Installation::scr_handle); - Progress::Finish(); return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/clients/software_proposal.ycp new/yast2-packager-2.13.122/src/clients/software_proposal.ycp --- old/yast2-packager-2.13.120/src/clients/software_proposal.ycp 2006-03-14 17:25:53.000000000 +0100 +++ new/yast2-packager-2.13.122/src/clients/software_proposal.ycp 2006-05-30 09:42:43.000000000 +0200 @@ -96,7 +96,9 @@ else { symbol result = `again; - string client_to_call = Stage::initial () + string client_to_call = (Stage::initial () + || (size (Pkg::ResolvableProperties ("", `pattern, "")) > 0 + && size (Pkg::GetSelections (`available, "base")) == 0)) ? "inst_sw_select" : "inst_sw_selection_select"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/modules/DontShowAgain.ycp new/yast2-packager-2.13.122/src/modules/DontShowAgain.ycp --- old/yast2-packager-2.13.120/src/modules/DontShowAgain.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.122/src/modules/DontShowAgain.ycp 2006-05-30 16:29:57.000000000 +0200 @@ -0,0 +1,326 @@ +/** + * File: modules/DontShowAgain.ycp + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * Summary: Handling "Don Not Show This Dialog Again" + * + * $Id: DontShowAgain.ycp 11111 2006-05-29 12:27:15Z locilka $ + */ +{ + module "DontShowAgain"; + textdomain "packager"; + + import "Directory"; + import "FileUtils"; + + /** + * Module for that stores and returns the information for + * "Don't Show This Dialog/Question Again" + */ + + /* File with the current configuration */ + string conf_file = Directory::vardir + "/dont_show_again.conf"; + + /** + * Current configuration map + * + * @struct $[ + * // question type + * "inst-source" : $[ + * // question identification (MD5sum of the question in the future?) + * "-question-ident-" : $[ + * // url of the file or directory + * "ftp://abc.xyz/rtf" : $[ + * // show the dialog again + * "show_again" : false, + * // additional question return + * "return" : true, + * ] + * ] + * ] + * ] + */ + map <string, map <string, map <string, any> > > current_configuration = $[]; + + /* Configuration has already been read */ + global boolean already_read = false; + + /** + * Function that reads the current configuration if it hasn't been + * read already. It must be called before every Get or Set command. + */ + void LazyLoadCurrentConf () { + if (! already_read) { + if (FileUtils::Exists(conf_file) && FileUtils::IsFile(conf_file)) { + y2milestone("Reading %1 file", conf_file); + // Read and evaluate the current configuration + map <string, map <string, map <string, any> > > read_conf = (map <string, map <string, map <string, any> > >) + SCR::Read(.target.ycp, conf_file); + if (read_conf != nil) { + current_configuration = read_conf; + } + } else { + y2milestone("Configuration file %1 doesn't exist, there's no current configuration.", + conf_file + ); + } + + // Configuration mustn't be read again + already_read = true; + } + } + + /** + * Saves the current configuration into the configuration file + */ + boolean SaveCurrentConfiguration () { + LazyLoadCurrentConf(); + + return SCR::Write(.target.ycp, conf_file, current_configuration); + } + + /** + * Returns whether the question should be shown again + * + * @param map <string, string> of params + * @see current_configuration + * @return boolean it should be shown + */ + global boolean GetShowQuestionAgain (map <string, string> params) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + + // <--- Installation Sources ---> + /* + * Parameters, $[ + * "q_type" : "inst-source", // mandatory + * "q_ident" : "Question Identification", // mandatory + * "q_url" : "URL" // optional + * ]; + */ + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (q_ident == nil) { + y2error("'q_ident' is a mandatory parameter"); + return nil; + } + + if (current_configuration[q_type]:nil == nil + || current_configuration[q_type, q_ident]:nil == nil + || current_configuration[q_type, q_ident, q_url]:nil == nil + || current_configuration[q_type, q_ident, q_url, "show_again"]:nil == nil) { + return nil; + } + + return (boolean) current_configuration[q_type, q_ident, q_url, "show_again"]:nil; + // <--- Installation Sources ---> + + // Add another types here... + } else { + y2error("'%1' is an unknown type", q_type); + return nil; + } + } + + /** + * Sets and stores whether the question should be shown again. + * If it should be, the result is not stored since the 'show again' + * is the default value. + * + * @param map <string, string> of params + * @see current_configuration + * @param boolean show again + * @return boolean if success + */ + global boolean SetShowQuestionAgain (map <string, string> params, boolean new_value) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + // Always set to 'true' if the configuration is changed + boolean conf_changed = false; + + // <--- Installation Sources ---> + /* + * Parameters, $[ + * "q_type" : "inst-source", // mandatory + * "q_ident" : "Question Identification", // mandatory + * "q_url" : "URL" // optional + * ]; + */ + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (q_ident == nil) { + y2error("'q_ident' is a mandatory parameter"); + return nil; + } + + // building the configuration map + if (current_configuration[q_type]:nil == nil) { + current_configuration[q_type] = $[]; + } + if (current_configuration[q_type, q_ident]:nil == nil) { + current_configuration[q_type, q_ident] = $[]; + } + if (current_configuration[q_type, q_ident, q_url]:nil == nil) { + current_configuration[q_type, q_ident, q_url] = $[]; + } + + // save the new value into the configuration + conf_changed = true; + current_configuration[q_type, q_ident, q_url, "show_again"] = new_value; + // <--- Installation Sources ---> + + // Add another types here... + } else { + y2error("'%1' is an unknown type", q_type); + return nil; + } + + if (conf_changed) return SaveCurrentConfiguration(); + else return nil; + } + + /** + * Return the default return value for question that should not + * be shown again + * + * @param map <string, string> of params + * @see current_configuration + * @return any default return value + */ + global any GetDefaultReturn (map <string, string> params) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + + // <--- Installation Sources ---> + /* + * Parameters, $[ + * "q_type" : "inst-source", // mandatory + * "q_ident" : "Question Identification", // mandatory + * "q_url" : "URL" // optional + * ]; + */ + // <--- Installation Sources ---> + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (current_configuration[q_type]:nil == nil + || current_configuration[q_type, q_ident]:nil == nil + || current_configuration[q_type, q_ident, q_url]:nil == nil + || current_configuration[q_type, q_ident, q_url, "return"]:nil == nil) { + return nil; + } + + return current_configuration[q_type, q_ident, q_url, "return"]:nil; + + // Add another types here... + } else { + y2error("'%1' is an unknown type", q_type); + return nil; + } + // <--- Installation Sources ---> + } + + /** + * Sets the default return value for the question that should not be shown + * + * @param map <string, string> of params + * @param any default return + * @see current_configuration + * @return boolean if success + */ + global boolean SetDefaultReturn (map <string, string> params, any default_return) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + // Always set to 'true' if the configuration is changed + boolean conf_changed = false; + + // <--- Installation Sources ---> + /* + * Parameters, $[ + * "q_type" : "inst-source", // mandatory + * "q_ident" : "Question Identification", // mandatory + * "q_url" : "URL" // optional + * ]; + */ + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (q_ident == nil) { + y2error("'q_ident' is a mandatory parameter"); + return nil; + } + + // building the configuration map + if (current_configuration[q_type]:nil == nil) { + current_configuration[q_type] = $[]; + } + if (current_configuration[q_type, q_ident]:nil == nil) { + current_configuration[q_type, q_ident] = $[]; + } + if (current_configuration[q_type, q_ident, q_url]:nil == nil) { + current_configuration[q_type, q_ident, q_url] = $[]; + } + + // save the new value into the configuration + conf_changed = true; + current_configuration[q_type, q_ident, q_url, "return"] = default_return; + // <--- Installation Sources ---> + + // Add another types here... + } else { + y2error("'%1' is an unknown type", q_type); + return nil; + } + + if (conf_changed) return SaveCurrentConfiguration(); + else return nil; + } + + /** + * Returns the current configuration map + * + * @return map <string, map <string, map <string, any> > > with the current configuration + * @see current_configuration + */ + global map <string, map <string, map <string, any> > > GetCurrentConfigurationMap () { + LazyLoadCurrentConf(); + return current_configuration; + } + + /** + * Removes one entry defined with map params + * + * @param map <string, string> of params + * @see current_configuration + * @return boolean if success + */ + global boolean RemoveShowQuestionAgain (map <string, string> params) { + LazyLoadCurrentConf(); + string q_type = params["q_type"]:nil; + + if (q_type == "inst-source") { + string q_ident = params["q_ident"]:nil; + string q_url = params["q_url"]:nil; + + if (current_configuration[q_type]:nil != nil + && current_configuration[q_type, q_ident]:nil != nil + && current_configuration[q_type, q_ident, q_url]:nil != nil) { + + current_configuration[q_type, q_ident, q_url] = nil; + SaveCurrentConfiguration(); + } + + return (current_configuration[q_type]:nil != nil + && current_configuration[q_type, q_ident]:nil != nil + && current_configuration[q_type, q_ident, q_url]:nil != nil); + } else { + y2error("'%1' is an unknown type", q_type); + return false; + } + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/modules/Packages.ycp new/yast2-packager-2.13.122/src/modules/Packages.ycp --- old/yast2-packager-2.13.120/src/modules/Packages.ycp 2006-05-25 17:42:43.000000000 +0200 +++ new/yast2-packager-2.13.122/src/modules/Packages.ycp 2006-05-30 16:12:59.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 31125 2006-05-24 10:55:12Z jsrain $ + * $Id: Packages.ycp 31191 2006-05-30 14:12:50Z jsrain $ */ { @@ -483,6 +483,7 @@ string current_base_selection = base_selections[0]:""; if (current_base_selection != "") { + Reset ([`product]); Pkg::ClearSelection (current_base_selection); } Pkg::SetSelection (basename); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/modules/SignatureCheckCallbacks.ycp new/yast2-packager-2.13.122/src/modules/SignatureCheckCallbacks.ycp --- old/yast2-packager-2.13.120/src/modules/SignatureCheckCallbacks.ycp 2006-04-25 17:07:59.000000000 +0200 +++ new/yast2-packager-2.13.122/src/modules/SignatureCheckCallbacks.ycp 2006-05-30 09:22:17.000000000 +0200 @@ -31,11 +31,11 @@ string dont_show_dialog_ident = "-AcceptUnsignedFile-"; // Show the popup? - if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) { + if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident, filename)) { return SignatureCheckDialogs::UseUnsignedItem(`file, filename, dont_show_dialog_ident); // Return the default value entered by user } else { - return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident); + return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename); } } @@ -53,11 +53,11 @@ string dont_show_dialog_ident = "-AcceptFileWithoutChecksum-"; // Show the popup? - if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) { + if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident, filename)) { return SignatureCheckDialogs::UseItemWithNoChecksum(`file, filename, dont_show_dialog_ident); // Return the default value entered by user } else { - return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident); + return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename); } } @@ -75,12 +75,12 @@ string dont_show_dialog_ident = "-AcceptUnknownGpgKey-"; // Show the popup? - if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) { + if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident, filename)) { // Unknown keyname == "Unknown Key" return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid, fingerprint, dont_show_dialog_ident); // Return the default value entered by user } else { - return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident); + return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.120/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.122/src/modules/SignatureCheckDialogs.ycp --- old/yast2-packager-2.13.120/src/modules/SignatureCheckDialogs.ycp 2006-04-25 17:07:59.000000000 +0200 +++ new/yast2-packager-2.13.122/src/modules/SignatureCheckDialogs.ycp 2006-05-30 09:22:17.000000000 +0200 @@ -15,29 +15,34 @@ import "Label"; import "Popup"; import "Message"; + import "DontShowAgain"; /* --------------------------- Don't show this dialog again Magic --------------------------- */ - map <string, boolean> show_popup = $[]; - map <string, boolean> popup_ret = $[]; - /** * Functions sets whether user want's to show the dialog again * * @param string popup_type dialog type * @param boolean show again + * @param string popup_url */ - global void SetShowThisPopup (string popup_type, boolean show_it) { + global void SetShowThisPopup (string popup_type, boolean show_it, string popup_url) { if (popup_type == nil || show_it == nil) { y2error("Neither popup_type %1 nor show_it %2 can be nil!", popup_type, show_it); return; } + + // it's the default if (show_it) { y2debug("User decision to show dialog '%1' again is '%2'", popup_type, show_it); + // store only "don't show" } else { - y2milestone("User decision to show dialog '%1' again is '%2'", popup_type, show_it); + y2milestone("User decision to show dialog '%1' for '%2' again is '%3'", popup_type, popup_url, show_it); + // Show again -> false, so, store it + DontShowAgain::SetShowQuestionAgain($[ + "q_type" : "inst-source", "q_ident" : popup_type, "q_url" : popup_url + ], show_it); } - show_popup[popup_type] = show_it; } /** @@ -45,15 +50,26 @@ * true is the default if nothing is set. * * @param string popup_type dialog type + * @param string popup_url if any * @return boolean show the dialog */ - global boolean GetShowThisPopup (string popup_type) { + global boolean GetShowThisPopup (string popup_type, string popup_url) { if (popup_type == nil) { y2error("popup_type %1 mustn't be nil!", popup_type); return true; } - // default (if not defined) is 'true' - return show_popup[popup_type]:true; + + // Read the current configuration from system configuration + boolean stored = DontShowAgain::GetShowQuestionAgain($[ + "q_type" : "inst-source", "q_ident" : popup_type, "q_url" : popup_url + ]); + + // Stored in the configuration + if (stored != nil) + return stored; + // Unknown status, return default + else + return true; } /** @@ -63,14 +79,16 @@ * @param string popup_type dialog type * @param boolean default_return */ - global void SetDefaultDialogReturn (string popup_type, boolean default_return) { + global void SetDefaultDialogReturn (string popup_type, boolean default_return, string popup_url) { if (popup_type == nil || default_return == nil) { y2error("Neither popup_type %1 nor default_return %2 can be nil!", popup_type, default_return); return; } - y2milestone("User decision in default return for '%1' is '%2'", - popup_type, default_return); - popup_ret[popup_type] = default_return; + y2milestone("User decision in default return for '%1' for '%2' is '%3'", + popup_type, popup_url, default_return); + DontShowAgain::SetDefaultReturn($[ + "q_type" : "inst-source", "q_ident" : popup_type, "q_url" : popup_url, + ], default_return); } /** @@ -80,17 +98,22 @@ * @param string popup_type dialog type * @boolean boolean default dialog return */ - global boolean GetDefaultDialogReturn (string popup_type) { + global boolean GetDefaultDialogReturn (string popup_type, string popup_url) { if (popup_type == nil) { y2error("popup_type %1 mustn't be nil!", popup_type); return false; } + + boolean stored_return = (boolean) DontShowAgain::GetDefaultReturn($[ + "q_type" : "inst-source", "q_ident" : popup_type, "q_url" : popup_url, + ]); + y2milestone("User decided not to show popup for '%1' again, returning user-decision '%2'", - popup_type, popup_ret[popup_type]:false); - return popup_ret[popup_type]:false; + popup_type, stored_return); + return stored_return; } - void HandleDoNotShowDialogAgain (boolean default_return, string dont_show_dialog_ident, symbol dont_show_dialog_checkboxid) { + void HandleDoNotShowDialogAgain (boolean default_return, string dont_show_dialog_ident, symbol dont_show_dialog_checkboxid, string dont_show_url) { boolean dont_show_status = (boolean) UI::QueryWidget(`id(dont_show_dialog_checkboxid), `Value); // Widget doesn't exist if (dont_show_status == nil) { @@ -99,11 +122,11 @@ } else if (dont_show_status == true) { y2debug("User decision -- don't show the dialog %1 again, setting default return %2", dont_show_dialog_ident, default_return); - SetShowThisPopup(dont_show_dialog_ident, false); - SetDefaultDialogReturn(dont_show_dialog_ident, default_return); + SetShowThisPopup(dont_show_dialog_ident, false, dont_show_url); + SetDefaultDialogReturn(dont_show_dialog_ident, default_return, dont_show_url); // Checkbox not selected -> Show again } else { - SetShowThisPopup(dont_show_dialog_ident, true); + SetShowThisPopup(dont_show_dialog_ident, true, dont_show_url); } } @@ -302,7 +325,7 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again), Message::DoNotShowMessageAgain(), - (GetShowThisPopup(dont_show_dialog_ident) ? false:true) + (GetShowThisPopup(dont_show_dialog_ident, item_name) ? false:true) ))), YesNoButtons(`no) ) @@ -313,7 +336,7 @@ if (ret == nil) ret = false; // Store the don't show value, store the default return value - HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again); + HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again, item_name); UI::CloseDialog(); return ret; @@ -359,7 +382,7 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again), Message::DoNotShowMessageAgain(), - (GetShowThisPopup(dont_show_dialog_ident) ? false:true) + (GetShowThisPopup(dont_show_dialog_ident, item_name) ? false:true) ))), YesNoButtons(`no) ) @@ -370,7 +393,7 @@ if (ret == nil) ret = false; // Store the don't show value, store the default return value - HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again); + HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again, item_name); UI::CloseDialog(); return ret; @@ -494,7 +517,7 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again), Message::DoNotShowMessageAgain(), - (GetShowThisPopup(dont_show_dialog_ident) ? false:true) + (GetShowThisPopup(dont_show_dialog_ident, item_name) ? false:true) ))), YesNoButtons(`no) ) @@ -508,7 +531,7 @@ if (ret == nil) ret = false; // Store the don't show value, store the default return value - HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again); + HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again, item_name); UI::CloseDialog(); return ret; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Wed May 31 02:58:05 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-05-29 14:05:19.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-05-30 15:26:11.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 30 15:24:35 CEST 2006 - sndirsch(a)suse.de + +- fixed check for empty /usr/X11R6/lib/X11/fonts/misc/fonts.dir + (Bug #178315) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.X5Qvdg/_old 2006-05-31 02:57:30.000000000 +0200 +++ /var/tmp/diff_new_pack.X5Qvdg/_new 2006-05-31 02:57:30.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 54 +Release: 55 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -1726,7 +1726,7 @@ make install.man DESTDIR=$RPM_BUILD_ROOT make install.sdk DESTDIR=$RPM_BUILD_ROOT # make sure that fonts.dir is not empty (Bug #178315) -test -s $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/fonts.dir +head -n 1 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/fonts.dir | grep "^0" && exit 1 # build libxf86config also for s390/s390x (Bug #145823) %ifarch s390 s390x make -C programs/Xserver/hw/xfree86/parser install DESTDIR=$RPM_BUILD_ROOT @@ -2718,6 +2718,9 @@ %clean %changelog -n xorg-x11 +* Tue May 30 2006 - sndirsch(a)suse.de +- fixed check for empty /usr/X11R6/lib/X11/fonts/misc/fonts.dir + (Bug #178315) * Mon May 29 2006 - sndirsch(a)suse.de - p_xlib_skip_select_substructure_redirect.diff: * fool java swing apps that no WM is running (Bug #151836) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11-driver-video
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Wed May 31 02:57:58 CEST 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-05-23 10:01:39.000000000 +0200 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-05-30 11:11:04.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 11:10:45 CEST 2006 - sndirsch(a)suse.de + +- added alternative i810 driver (Bug #179773) + +------------------------------------------------------------------- New: ---- randrstr.h xf86-video-i810-X11R7.1-1.6.0.diff xf86-video-i810-X11R7.1-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.B6LM4B/_old 2006-05-31 02:57:34.000000000 +0200 +++ /var/tmp/diff_new_pack.B6LM4B/_new 2006-05-31 02:57:34.000000000 +0200 @@ -20,7 +20,7 @@ Group: System/X11/Servers/XF86_4 Autoreqprov: on Version: 6.9.0 -Release: 47 +Release: 48 Summary: Various X.Org video drivers Requires: xorg-x11-server Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/drivers/sis_drv.o @@ -35,6 +35,8 @@ Source8: xorg-x11-sis-6.9.0.tar.bz2 Source9: xorg-x11-ati-6.8.2suse100.tar.bz2 Source10: xorg-x11-ati-1_0_branch-060425.tar.bz2 +Source11: xf86-video-i810-X11R7.1-1.6.0.tar.bz2 +Source12: randrstr.h Patch: ps_nv.diff Patch1: p_64bit-clean.diff Patch2: p_radeon-memmap.diff @@ -58,6 +60,7 @@ Patch20: nv-060426.diff Patch21: radeon_bios.diff Patch22: rn50_disable-render-accel.diff +Patch23: xf86-video-i810-X11R7.1-1.6.0.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define BUILD_ALL 1 %define ATI_SUSE100 1 @@ -152,7 +155,7 @@ %endif %prep %if %ATI_SUSE100 -%setup -n xc/programs/Xserver/hw/xfree86/drivers -b3 -b4 -b5 -b6 -b7 -b8 -b9 +%setup -n xc/programs/Xserver/hw/xfree86/drivers -b3 -b4 -b5 -b6 -b7 -b8 -b9 -a11 pushd ati-6.8.2suse100 %patch3 popd @@ -210,14 +213,22 @@ %patch20 popd %endif +pushd xf86-video-i810-X11R7.1-1.6.0/src + cp ../../i810/Imakefile . + cp $RPM_SOURCE_DIR/randrstr.h . + patch -p0 < $RPM_SOURCE_DIR/xf86-video-i810-X11R7.1-1.6.0.diff +popd %build %ifnarch s390 s390x %if %BUILD_ALL -for dir in $(ls); do +for dir in xf86-video-i810-X11R7.1-1.6.0/src $(ls|grep -v xf86-video-i810-X11R7.1-1.6.0); do %else for dir in $(ls|grep ast); do %endif +%ifarch ppc64 + test "$dir" == "xf86-video-i810-X11R7.1-1.6.0/src" && continue +%endif pushd $dir xmkmf make CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -I/usr/X11R6/%{_lib}/Server/include -I/usr/X11R6/%{_lib}/Server/include/extensions -I/usr/X11R6/%{_lib}/Server/drivers/ati -I/usr/include/drm" PREPROCESSMANPAGES="true" @@ -228,10 +239,13 @@ %install %ifnarch s390 s390x %if %BUILD_ALL -for dir in $(ls); do +for dir in xf86-video-i810-X11R7.1-1.6.0/src $(ls|grep -v xf86-video-i810-X11R7.1-1.6.0); do %else for dir in $(ls|grep ast); do %endif +%ifarch ppc64 + test "$dir" == "xf86-video-i810-X11R7.1-1.6.0/src" && continue +%endif pushd $dir make install DESTDIR=$RPM_BUILD_ROOT make install.man DESTDIR=$RPM_BUILD_ROOT @@ -269,6 +283,9 @@ /usr/X11R6/%{_lib}/modules/drivers/ati_drv.so /usr/X11R6/%{_lib}/modules/drivers/atimisc_drv.so /usr/X11R6/%{_lib}/modules/drivers/i810_drv.so +%ifnarch ppc64 +/usr/X11R6/%{_lib}/modules/drivers/i810xorg71_drv.so +%endif /usr/X11R6/%{_lib}/modules/drivers/mga_drv.so %ifarch %ix86 /usr/X11R6/%{_lib}/modules/drivers/mga_hal_drv.so @@ -304,6 +321,8 @@ %endif %changelog -n xorg-x11-driver-video +* Tue May 30 2006 - sndirsch(a)suse.de +- added alternative i810 driver (Bug #179773) * Tue May 23 2006 - sndirsch(a)suse.de - no longer remove NVIDIA driver in %%pre of xorg-x11-driver-video-nvidia; it no longer conflicts with NVIDIA ++++++ xf86-video-i810-X11R7.1-1.6.0.diff ++++++ diff -u -r ../src.orig/Imakefile ./Imakefile --- ../src.orig/Imakefile 2006-05-29 20:04:27.000000000 +0000 +++ ./Imakefile 2006-05-29 20:03:54.000000000 +0000 @@ -42,9 +42,9 @@ i810_video.o i810_io.o i830_modes.o #endif I830SRCS = i830_driver.c i830_memory.c i830_cursor.c i830_accel.c i830_io.c \ - i830_dga.c i830_shadow.c $(I830SRCS1) $(I830SRCS2) + i830_dga.c i830_randr.c i830_rotate.c $(I830SRCS1) $(I830SRCS2) I830OBJS = i830_driver.o i830_memory.o i830_cursor.o i830_accel.o i830_io.o \ - i830_dga.o i830_shadow.o $(I830OBJS1) $(I830OBJS2) + i830_dga.o i830_randr.o i830_rotate.o $(I830OBJS1) $(I830OBJS2) SRCS = i810_driver.c \ $(I810SRCS) $(I830SRCS) $(DRISRCS) @@ -86,13 +86,9 @@ ModuleObjectRule() -ObjectModuleTarget(i810,$(OBJS)) +ObjectModuleTarget(i810xorg71,$(OBJS)) -InstallVideoObjectModule(i810,$(MODULEDIR)) - -#if !defined(XF86DriverSDK) -InstallModuleManPage(i810) -#endif +InstallVideoObjectModule(i810xorg71,$(MODULEDIR)) DependTarget() @@ -121,7 +117,8 @@ InstallDriverSDKNonExecFile(i830_dri.h,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i830_driver.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i830_memory.c,$(DRIVERSDKDIR)/drivers/i810) -InstallDriverSDKNonExecFile(i830_shadow.c,$(DRIVERSDKDIR)/drivers/i810) +InstallDriverSDKNonExecFile(i830_randr.c,$(DRIVERSDKDIR)/drivers/i810) +InstallDriverSDKNonExecFile(i830_rotate.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i830_video.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKObjectModule(i810,$(DRIVERSDKMODULEDIR),drivers) diff -u -r ../src.orig/i810.h ./i810.h --- ../src.orig/i810.h 2006-05-29 20:00:09.000000000 +0000 +++ ./i810.h 2006-05-29 20:07:46.000000000 +0000 @@ -62,8 +62,8 @@ #include "common.h" #define I810_VERSION 4000 -#define I810_NAME "I810" -#define I810_DRIVER_NAME "i810" +#define I810_NAME "I810XORG71" +#define I810_DRIVER_NAME "i810xorg71" #define I810_MAJOR_VERSION 1 #define I810_MINOR_VERSION 6 #define I810_PATCHLEVEL 0 diff -u -r ../src.orig/i810_driver.c ./i810_driver.c --- ../src.orig/i810_driver.c 2006-05-29 20:00:09.000000000 +0000 +++ ./i810_driver.c 2006-05-29 20:06:34.000000000 +0000 @@ -367,7 +367,7 @@ static MODULESETUPPROTO(i810Setup); static XF86ModuleVersionInfo i810VersRec = { - "i810", + "i810xorg71", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -379,7 +379,7 @@ {0, 0, 0, 0} }; -_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, 0 }; +_X_EXPORT XF86ModuleData i810xorg71ModuleData = { &i810VersRec, i810Setup, 0 }; static pointer i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) --- i830_rotate.c.orig 2006-05-29 20:32:24.000000000 +0000 +++ i830_rotate.c 2006-05-29 20:34:35.000000000 +0000 @@ -199,7 +199,7 @@ I830Ptr pI830 = I830PTR(pScrn); ScrnInfoPtr pScrn1 = pScrn; I830Ptr pI8301 = NULL; - RegionPtr damage = shadowDamage(pBuf); + RegionPtr damage = (RegionPtr) shadowDamage(pBuf); int nbox = REGION_NUM_RECTS (damage); BoxPtr pbox = REGION_RECTS (damage); int box_x1, box_x2, box_y1, box_y2; @@ -431,7 +431,7 @@ I830Ptr pI830 = I830PTR(pScrn); I830Ptr pI8301 = NULL; ScrnInfoPtr pScrn1 = pScrn; - RegionPtr damage = shadowDamage(pBuf); + RegionPtr damage = (RegionPtr) shadowDamage(pBuf); int nbox = REGION_NUM_RECTS (damage); BoxPtr pbox = REGION_RECTS (damage); int box_x1, box_x2, box_y1, box_y2; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xgl
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package xgl checked in at Wed May 31 02:57:29 CEST 2006. -------- --- xgl/xgl.changes 2006-05-26 11:58:06.000000000 +0200 +++ xgl/xgl.changes 2006-05-30 01:22:10.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 01:20:14 CEST 2006 - dreveman(a)suse.de + +- Fix typo in xglFillSegment. (bnc #178234) + +------------------------------------------------------------------- Old: ---- 178234.diff New: ---- 178234-2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.5IAKqZ/_old 2006-05-31 02:57:08.000000000 +0200 +++ /var/tmp/diff_new_pack.5IAKqZ/_new 2006-05-31 02:57:08.000000000 +0200 @@ -24,7 +24,7 @@ Requires: xgl-hardware-list Autoreqprov: on Version: cvs_060522 -Release: 2 +Release: 3 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -43,7 +43,7 @@ Patch2: xgl-xpstubs-link-hack.diff Patch3: xgl-maprules-tolower-fix.diff Patch4: 178214.diff -Patch5: 178234.diff +Patch5: 178234-2.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -82,7 +82,7 @@ patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xpstubs-link-hack.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-maprules-tolower-fix.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178214.diff || exit 1 -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178234.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178234-2.diff || exit 1 %build PREFIX=$RPM_BUILD_ROOT/usr/X11R6/lib/xgl @@ -145,6 +145,8 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Tue May 30 2006 - dreveman(a)suse.de +- Fix typo in xglFillSegment. (bnc #178234) * Fri May 26 2006 - dreveman(a)suse.de - Adjust for capStyle correctly in xglFillSegment. (bnc #178234) - Add info logging. (bnc #178214) ++++++ 178234-2.diff ++++++ --- hw/xgl/xglfill.c 18 Jan 2006 07:15:54 -0000 1.9 +++ hw/xgl/xglfill.c 26 May 2006 08:24:30 -0000 @@ -585,15 +585,19 @@ { full.x1 = pSegInit->x1; full.x2 = pSegInit->x2; + if (pGC->capStyle != CapNotLast) + full.x2++; } else { full.x1 = pSegInit->x2; - full.x2 = pSegInit->x1; + full.x2 = pSegInit->x1 + 1; + if (pGC->capStyle == CapNotLast) + full.x1++; } full.x1 += pDrawable->x; - full.x2 += pDrawable->x + 1; + full.x2 += pDrawable->x; full.y1 = pSegInit->y1 + pDrawable->y; full.y2 = full.y1 + 1; } @@ -603,15 +607,19 @@ { full.y1 = pSegInit->y1; full.y2 = pSegInit->y2; + if (pGC->capStyle != CapNotLast) + full.y2++; } else { full.y1 = pSegInit->y2; - full.y2 = pSegInit->y1; + full.y2 = pSegInit->y1 + 1; + if (pGC->capStyle == CapNotLast) + full.y1++; } full.y1 += pDrawable->y; - full.y2 += pDrawable->y + 1; + full.y2 += pDrawable->y; full.x1 = pSegInit->x1 + pDrawable->x; full.x2 = full.x1 + 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit vdr13
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package vdr13 checked in at Wed May 31 02:57:11 CEST 2006. -------- --- vdr13/vdr13.changes 2006-05-02 14:03:08.000000000 +0200 +++ vdr13/vdr13.changes 2006-05-30 08:50:43.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 08:50:23 CEST 2006 - lnussel(a)suse.de + +- add maintenance patches 1 and 2 + +------------------------------------------------------------------- New: ---- vdr-1.4.0-1_norunvdr.diff vdr-1.4.0-2_norunvdr.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr13.spec ++++++ --- /var/tmp/diff_new_pack.AxQCs2/_old 2006-05-31 02:57:05.000000000 +0200 +++ /var/tmp/diff_new_pack.AxQCs2/_new 2006-05-31 02:57:05.000000000 +0200 @@ -11,7 +11,12 @@ # norootforbuild Name: vdr13 -BuildRequires: dvb freetype2-devel gcc-c++ libcap-devel libjpeg-devel +BuildRequires: dvb freetype2-devel gcc-c++ libjpeg-devel +%if %suse_version > 1000 +BuildRequires: libcap-devel +%else +BuildRequires: libcap +%endif %define with_freetype %{?_with_freetype:1}%{!?_with_freetype:0} URL: http://www.cadsoft.de/people/kls/vdr/ License: GPL @@ -19,7 +24,7 @@ Requires: dvb Prereq: /usr/sbin/useradd Version: 1.4.0 -Release: 2 +Release: 4 Summary: Video Disk Recorder Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2 Source1: rcvdr @@ -32,7 +37,8 @@ Source8: channels.conf Source9: remote.conf Patch0: vdr13-scripts.diff -#Patch10: vdr-1.3.30-su.diff +Patch1: vdr-1.4.0-1_norunvdr.diff +Patch2: vdr-1.4.0-2_norunvdr.diff Patch12: vdr-1.3.45-dvbplayer-nosleep.diff Patch13: vdr-1.3.25-utf8-0.0.3.patch Patch14: vdr-1.3.23-utf8-fonts.diff @@ -109,7 +115,8 @@ fi # qpatch %PATCH0 -#qpatch %PATCH10 +qpatch %PATCH1 +qpatch %PATCH2 qpatch %PATCH12 #qpatch %PATCH11 %if %with_freetype @@ -221,6 +228,8 @@ /var/adm/fillup-templates/* %changelog -n vdr13 +* Tue May 30 2006 - lnussel(a)suse.de +- add maintenance patches 1 and 2 * Tue May 02 2006 - lnussel(a)suse.de - new version 1.4.0 - fix runvdr script not working with plugins that have a dash in the ++++++ vdr-1.4.0-1_norunvdr.diff ++++++ ++++ 663 lines (skipped) ++++++ vdr-1.4.0-2_norunvdr.diff ++++++ ++++ 1116 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit valgrind
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package valgrind checked in at Wed May 31 02:57:03 CEST 2006. -------- --- valgrind/valgrind.changes 2006-03-16 10:31:09.000000000 +0100 +++ valgrind/valgrind.changes 2006-05-30 16:23:36.000000000 +0200 @@ -1,0 +2,9 @@ +Tue May 30 16:23:03 CEST 2006 - dmueller(a)suse.de + +- update to 3.2.0 rc1: + * ppc64 support + * callgrind now integrated part + * massive performance improvements + * lots of emulation fixlets + +------------------------------------------------------------------- Old: ---- valgrind-3.1.1.tar.bz2 New: ---- valgrind-3.2.0rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.r5qZCs/_old 2006-05-31 02:56:52.000000000 +0200 +++ /var/tmp/diff_new_pack.r5qZCs/_new 2006-05-31 02:56:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package valgrind (Version 3.1.1) +# spec file for package valgrind (Version 3.2.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,14 +17,16 @@ Group: Development/Tools/Debuggers Summary: Memory Management Debugger BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 3.1.1 +Version: 3.2.0 Release: 1 -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-3.2.0rc1.tar.bz2 # svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_1_0 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH > 3_1_BRANCH.diff # svn di svn://svn.valgrind.org/vex/tags/VEX_3_1_0 svn://svn.valgrind.org/vex/branches/VEX_3_1_BRANCH > VEX_3_1_BRANCH.diff #Patch0: 3_1_BRANCH.diff #Patch1: VEX_3_1_BRANCH.diff -ExclusiveArch: %ix86 x86_64 ppc +Provides: callgrind +Obsoletes: callgrind +ExclusiveArch: %ix86 x86_64 ppc ppc64 %description Valgrind checks all memory operations in an application, like read, @@ -60,7 +62,7 @@ Robert Walsh %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-3.2.0rc1 #%patch cd VEX #%patch1 @@ -84,11 +86,18 @@ %doc README* NEWS ACKNOWLEDGEMENTS AUTHORS COPYING /usr/bin/* /usr/include/valgrind +/usr/include/callgrind /usr/%_lib/pkgconfig/valgrind.pc %_libdir/valgrind %doc %_mandir/*/* %changelog -n valgrind +* Tue May 30 2006 - dmueller(a)suse.de +- update to 3.2.0 rc1: + * ppc64 support + * callgrind now integrated part + * massive performance improvements + * lots of emulation fixlets * Thu Mar 16 2006 - dmueller(a)suse.de - update to 3.1.1 (FATE #300493) * Mon Mar 06 2006 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit tomboy
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package tomboy checked in at Wed May 31 02:56:52 CEST 2006. -------- --- GNOME/tomboy/tomboy.changes 2006-05-20 00:12:50.000000000 +0200 +++ tomboy/tomboy.changes 2006-05-30 22:27:42.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 22:27:20 CEST 2006 - gekker(a)suse.de + +- Add translations for fi, zh_TW, update translations for hu + +------------------------------------------------------------------- New: ---- tomboy-i18n.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.NYRKml/_old 2006-05-31 02:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.NYRKml/_new 2006-05-31 02:56:44.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Requires: mono Version: 0.3.3 -Release: 46 +Release: 49 Summary: GNOME note taking application. URL: http://www.beatniksoftware.com/tomboy/ Source: %{name}-%{version}.tar.bz2 @@ -43,6 +43,7 @@ Patch10: tomboy-null-match-175872.patch Patch11: tomboy-dnd-crash-176704.patch Patch12: tomboy-always-handle-args-177298.patch +Patch13: tomboy-i18n.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core Requires: dbus-1 dbus-1-x11 @@ -81,6 +82,7 @@ %patch10 %patch11 %patch12 +%patch13 cp %SOURCE1 data/images/tomboy.png cp %SOURCE1 data/images/tomboy-48.png cp %SOURCE2 data/images/tomboy-24.png @@ -144,6 +146,8 @@ %{prefix}/%_lib/dbus-1.0/services/com.beatniksoftware.Tomboy.service %changelog -n tomboy +* Tue May 30 2006 - gekker(a)suse.de +- Add translations for fi, zh_TW, update translations for hu * Sat May 20 2006 - gekker(a)suse.de - Update translations for pt_BR, fr, it, de, zh_CN * Fri May 19 2006 - joeshaw(a)suse.de ++++++ tomboy-i18n.patch ++++++ --- configure.in~ 2005-08-09 18:36:30.000000000 -0600 +++ configure.in 2006-05-30 14:23:22.000000000 -0600 @@ -16,7 +16,7 @@ AM_PROG_LIBTOOL # # Setup GETTEXT # -ALL_LINGUAS="bg ca cs da de en_CA en_GB es eu fr hu is it ja ko lt nb nl no pa pl pt_BR rw sq sv tr uk zh_CN" +ALL_LINGUAS="bg ca cs da de en_CA en_GB es eu fi fr hu is it ja ko lt nb nl no pa pl pt_BR rw sq sv tr uk zh_CN zh_TW" GETTEXT_PACKAGE=tomboy AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) ++++++ tomboy-po.tar.bz2 ++++++ Binary files old/po/bg.gmo and new/po/bg.gmo differ Binary files old/po/ca.gmo and new/po/ca.gmo differ Binary files old/po/cs.gmo and new/po/cs.gmo differ Binary files old/po/da.gmo and new/po/da.gmo differ Binary files old/po/de.gmo and new/po/de.gmo differ Binary files old/po/en_CA.gmo and new/po/en_CA.gmo differ Binary files old/po/en_GB.gmo and new/po/en_GB.gmo differ Binary files old/po/es.gmo and new/po/es.gmo differ Binary files old/po/eu.gmo and new/po/eu.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/fi.po new/po/fi.po --- old/po/fi.po 1970-01-01 01:00:00.000000000 +0100 +++ new/po/fi.po 2006-05-30 22:20:45.000000000 +0200 @@ -0,0 +1,732 @@ +# translation of tomboy.po to Suomi +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Jyri Palokangas <jmp(a)netti.fi>, 2006. +msgid "" +msgstr "" +"Project-Id-Version: tomboy\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-04-25 22:01+0200\n" +"PO-Revision-Date: 2006-05-16 09:11+0300\n" +"Last-Translator: Jyri Palokangas <jmp(a)netti.fi>\n" +"Language-Team: Suomi <yast-trans-fi(a)kotoistaminen.novell.fi>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: KBabel 1.11.2\n" + +#: ../data/DefaultPlugins.desktop.in.in.h:1 +msgid "Default Plugins" +msgstr "Oletusliitännäiset" + +#: ../data/DefaultPlugins.desktop.in.in.h:2 +msgid "Directory containing system-installed Plugins" +msgstr "Järjestelmään asennettujen liitännäisten hakemisto" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:1 +msgid "Accessories" +msgstr "Apuohjelmat" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:2 +msgid "Simple and easy to use note-taking" +msgstr "Yksinkertainen ja helppokäyttöinen muistiinpanosovelma" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:3 +msgid "Tomboy Applet Factory" +msgstr "Tomboy-sovelman tehdas" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3 +#: ../Tomboy/Applet.cs:134 ../Tomboy/Tray.cs:38 +msgid "Tomboy Notes" +msgstr "Tomboy -muistilaput" + +#: ../data/GNOME_TomboyApplet.xml.h:1 +msgid "_About Tomboy..." +msgstr "_Tietoja Tomboysta" + +#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/Applet.cs:175 +#: ../Tomboy/NoteWindow.cs:547 +msgid "_Open Plugins Folder" +msgstr "_Avaa liitännäisten kansio" + +#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/Applet.cs:170 +msgid "_Preferences..." +msgstr "_Asetukset..." + +#: ../data/tomboy.desktop.in.h:1 +msgid "Note-taker" +msgstr "Muistilaput" + +#: ../data/tomboy.desktop.in.h:2 +msgid "Quick and handy note-taker" +msgstr "Nopea ja näppärä muistilappu" + +#: ../data/tomboy.schemas.in.h:1 +msgid "Create a new Note" +msgstr "Luo uusi muistilappu" + +#: ../data/tomboy.schemas.in.h:2 +msgid "Custom Font Face" +msgstr "Oma kirjasin" + +#: ../data/tomboy.schemas.in.h:3 +msgid "Enable WikiWord highlighting" +msgstr "Käytä WikiSanat-korostusta" + +#: ../data/tomboy.schemas.in.h:4 +msgid "Enable custom font" +msgstr "Käytä omaa kirjasinta" + +#: ../data/tomboy.schemas.in.h:5 +msgid "Enable global keybindings" +msgstr "Käytä yhteisiä näppäinoikoteitä" + +#: ../data/tomboy.schemas.in.h:6 +msgid "Enable spellchecking" +msgstr "Tarkista oikeinkirjoitus" + +#: ../data/tomboy.schemas.in.h:7 +msgid "" +"Enable this option to highlight words ThatLookLikeThis. Clicking the word " +"will create a note with that name." +msgstr "" +"Käytä toimintoa, joka korostaa sanat JotkaNäyttävätTältä. Sanan kohdalta " +"napsauttaminen luo uuden muistilapun tällä nimellä." + +#: ../data/tomboy.schemas.in.h:8 +msgid "HTML Export Last Directory" +msgstr "Vie HTML-muodossa viimeisin hakemisto" + +#: ../data/tomboy.schemas.in.h:9 +msgid "HTML Export Linked Notes" +msgstr "Vie HTML-muodossa linkitetyt muistilaput" + +#: ../data/tomboy.schemas.in.h:10 +msgid "" +"If enable_custom_font is true, the font name set here will be used as the " +"font when displaying notes." +msgstr "" +"Jos oma kirjasin on käytössä, käytetään muistilappuja näytettäessä tässä " +"määriteltyä kirjasinta." + +#: ../data/tomboy.schemas.in.h:11 +msgid "" +"If true, misspellings will be underlined in red, and correct spelling " +"suggestions shown in the right-click menu." +msgstr "" +"Jos käytössä, alleviivataan väärin kirjoitukset punaisella ja samalla " +"näytetään ehdotus oikeaksi kirjoitusasuksi ponnahdusvalikossa." + +#: ../data/tomboy.schemas.in.h:12 +msgid "" +"If true, the desktop-global keybindings set in /apps/tomboy/" +"global_keybindings will be enabled, allowing for useful Tomboy actions to be " +"available from any application." +msgstr "" +"Jos tosi, otetaan käyttöön työpöydän laajuiset näppäinoikotiet, jotka on " +"asetettu kohdassa /apps/tomboy/global_keybindings. Nämä mahdollistavat " +"hyödyllisiä Tomboyn toimintoja mistä tahansa sovelluksesta." + +#: ../data/tomboy.schemas.in.h:13 +msgid "" +"If true, the font name set in custom_font_face will be used as the font when " +"displaying notes. Otherwise the desktop default font will be used." +msgstr "" +"Jos tosi, käytetään kohdassa custom_font_face määriteltyä kirjasinta, kun " +"muistilappuja näytetään. Muussa tapauksessa käytetään työpöydän " +"oletuskirjasinta." + +#: ../data/tomboy.schemas.in.h:14 +msgid "Open Recent Changes" +msgstr "Avaa viimeiset muutokset" + +#: ../data/tomboy.schemas.in.h:15 +msgid "Open Search Dialog" +msgstr "Avaa hakuikkuna" + +#: ../data/tomboy.schemas.in.h:16 +msgid "Open Start Here" +msgstr "Avaa Käynnistä tästä" + +#: ../data/tomboy.schemas.in.h:17 +msgid "Show applet menu" +msgstr "Näytä sovelman valikko" + +#: ../data/tomboy.schemas.in.h:18 +msgid "" +"The global keybinding for creating and displaying a new Note. The format " +"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The " +"parser is fairly liberal and allows lower or upper case, and also " +"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the " +"option to the special string \"disabled\", then there will be no keybinding " +"for this action." +msgstr "" +"Työpöydän laajuinen pikanäppäin uuden muistilapun tekemiseksi. Muoto on " +"esimerkiksi \"<Control>a\" tai \"<Shift><Alt>F1\". " +"Merkkijonon tulkinta on melko vapaata ja sallii pienet ja suuret kirjaimet " +"sekä tietyt lyhenteet, kuten \"<Ctl>\" ja \"<Ctrl>\". Jos asetat " +"merkkijonon erikoisarvoon \"disabled\", ei tälle toiminnolle ole " +"pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:19 +msgid "" +"The global keybinding for opening the \"Start Here\" note. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"Työpöydän laajuinen pikanäppäin uuden \"Aloita Tästä\"-muistilapun " +"avaamiseksi. Muoto on esimerkiksi \"<Control>a\" tai \"<Shift>" +"<Alt>F1\". Merkkijonon tulkinta on melko vapaata ja sallii pienet ja " +"suuret kirjaimet sekä tietyt lyhenteet, kuten \"<Ctl>\" ja \"<" +"Ctrl>\". Jos asetat merkkijonon erikoisarvoon \"disabled\", ei tälle " +"toiminnolle ole pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:20 +msgid "" +"The global keybinding for opening the Note Search dialog. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"Työpöydän laajuinen pikanäppäin uuden \"Etsi muistilapuista\"-" +"ikkunalleavaamiseksi. Muoto on esimerkiksi \"<Control>a\" tai \"<" +"Shift><Alt>F1\". Merkkijonon tulkinta on melko vapaata ja sallii " +"pienet ja suuret kirjaimet sekä tietyt lyhenteet, kuten \"<Ctl>\" ja " +"\"<Ctrl>\". Jos asetat merkkijonon erikoisarvoon \"disabled\", ei " +"tälle toiminnolle ole pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:21 +msgid "" +"The global keybinding for opening the Recent Changes dialog. The format " +"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The " +"parser is fairly liberal and allows lower or upper case, and also " +"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the " +"option to the special string \"disabled\", then there will be no keybinding " +"for this action." +msgstr "" +"Työpöydän laajuinen pikanäppäin viimeaikaisten muutosten avaamiseen." +"avaamiseksi. Muoto on esimerkiksi \"<Control>a\" tai \"<Shift>" +"<Alt>F1\". Merkkijonon tulkinta on melko vapaata ja sallii pienet ja " +"suuret kirjaimet sekä tietyt lyhenteet, kuten \"<Ctl>\" ja \"<" +"Ctrl>\". Jos asetat merkkijonon erikoisarvoon \"disabled\", ei tälle " +"toiminnolle ole pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:22 +msgid "" +"The global keybinding for showing the Tomboy applet's menu. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"Työpöydän laajuinen pikanäppäin Tomboy-sovelman valikon näyttämiseksi.Muoto " +"on esimerkiksi \"<Control>a\" tai \"<Shift><Alt>F1\". " +"Merkkijonon tulkinta on melko vapaata ja sallii pienet ja suuret kirjaimet " +"sekä tietyt lyhenteet, kuten \"<Ctl>\" ja \"<Ctrl>\". Jos asetat " +"merkkijonon erikoisarvoon \"disabled\", ei tälle toiminnolle ole " +"pikanäppäintä." + +#: ../data/tomboy.schemas.in.h:23 +msgid "" +"The last directory a note was exported to using the Export To HTML plugin." +msgstr "" +"Viimeisin hakemisto, johon \"Vie HTML-tiedostona\"-liitännäisellä " +"tallennettiin tiedosto." + +#: ../data/tomboy.schemas.in.h:24 +msgid "" +"The last setting for the 'Export linked notes' checkbox in the Export to " +"HTML plugin." +msgstr "" +"Viimeisin asetus \"Vie linkitetyt muistilaput\"-ruudulle liitännäisessä " +"\"Vie HTML-tiedostoon\"." + +#: ../libtomboy/gedit-print.c:144 ../Tomboy/Plugins/PrintNotes.cs:15 +msgid "Print" +msgstr "Tulosta" + +#: ../libtomboy/gedit-print.c:243 +msgid "Preparing pages..." +msgstr "Valmistellaan sivuja..." + +#: ../libtomboy/gedit-print.c:270 +#, c-format +msgid "Rendering page %d of %d..." +msgstr "Piirretään sivua %d/%d" + +#: ../libtomboy/gedit-print.c:272 +#, c-format +msgid "Printing page %d of %d..." +msgstr "Tulostetaan sivua %d/%d" + +#: ../libtomboy/gedit-print.c:294 +msgid "Print preview" +msgstr "Tulostuksen esikatselu" + +#: ../libtomboy/gedit-print.c:446 +msgid "Page %N of %Q" +msgstr "Sivu %N/%Q" + +#: ../libtomboy/gedit-print.c:448 +msgid "%A %D, %I:%M %p" +msgstr "%A %D, %I:%M %p" + +#: ../Tomboy/Applet.cs:180 +msgid "_About Tomboy" +msgstr "_Tietoja Tomboysta" + +#: ../Tomboy/Applet.cs:187 +msgid "_Quit" +msgstr "_Lopeta" + +#. Open the Start Here note +#: ../Tomboy/Note.cs:393 ../Tomboy/NoteManager.cs:89 +#: ../Tomboy/NoteManager.cs:96 ../Tomboy/Tomboy.cs:210 ../Tomboy/Tray.cs:112 +#: ../Tomboy/Tray.cs:278 ../Tomboy/XKeybinder.cs:259 +msgid "Start Here" +msgstr "Aloita tästä" + +#: ../Tomboy/NoteManager.cs:90 +msgid "Welcome to Tomboy!" +msgstr "Tervetuloa Tomboyhin!" + +#: ../Tomboy/NoteManager.cs:91 +msgid "" +"Use this page as a Start Page for organizing your notes and keeping " +"unorganized ideas around." +msgstr "" +"Käytä tätä sivua aloitussivuna, josta järjestelet muistilappujasi ja jolla " +"voit pitää luokittelemattomia ajatuksia." + +#: ../Tomboy/NoteManager.cs:153 +#, csharp-format +msgid "New Note {0}" +msgstr "Uusi muistilappu {0}" + +#: ../Tomboy/NoteManager.cs:170 +msgid "Describe your new note here." +msgstr "Kirjoita tähän uuden muistilapun kuvaus." + +#: ../Tomboy/NoteWindow.cs:313 +msgid "Really delete this note?" +msgstr "Poistetaanko tämä muistilappu?" + +#: ../Tomboy/NoteWindow.cs:314 +msgid "If you delete a note it is permanently lost." +msgstr "Jos poistat, hukataan muistilappu pysyvästi." + +#: ../Tomboy/NoteWindow.cs:398 +msgid "_Link to New Note" +msgstr "_Linkki uuteen muistilappuun" + +#: ../Tomboy/NoteWindow.cs:411 +msgid "Te_xt" +msgstr "Te_ksti" + +#: ../Tomboy/NoteWindow.cs:419 +msgid "_Search" +msgstr "_Etsi" + +#: ../Tomboy/NoteWindow.cs:433 +msgid "Clos_e All Notes" +msgstr "Sulj_e kaikki muistilaput" + +#: ../Tomboy/NoteWindow.cs:443 +msgid "_Close" +msgstr "_Sulje" + +#: ../Tomboy/NoteWindow.cs:471 +msgid "Search" +msgstr "Etsi" + +#: ../Tomboy/NoteWindow.cs:472 +msgid "Search your notes" +msgstr "Etsi muistilapuistasi" + +#: ../Tomboy/NoteWindow.cs:484 +msgid "Link" +msgstr "Linkki" + +#: ../Tomboy/NoteWindow.cs:485 +msgid "Link selected text to a new note" +msgstr "Linkitä valittu teksti uuteen muistilappuun" + +#: ../Tomboy/NoteWindow.cs:499 +msgid "_Text" +msgstr "_Teksti" + +#: ../Tomboy/NoteWindow.cs:504 +msgid "Set properties of text" +msgstr "Aseta tekstin ominaisuudet" + +#: ../Tomboy/NoteWindow.cs:510 +msgid "_Plugins" +msgstr "_Liitännäiset" + +#: ../Tomboy/NoteWindow.cs:514 +msgid "Run Plugin actions" +msgstr "Suorita liitännäisten tehtävät" + +#: ../Tomboy/NoteWindow.cs:521 +msgid "Delete" +msgstr "Poista" + +#: ../Tomboy/NoteWindow.cs:522 +msgid "Delete this note" +msgstr "Poista tämä muistilappu" + +#: ../Tomboy/NoteWindow.cs:579 +msgid "_Search..." +msgstr "_Etsi..." + +#: ../Tomboy/NoteWindow.cs:590 ../Tomboy/Search.cs:176 +msgid "Find _Next" +msgstr "Etsi _seuraava" + +#: ../Tomboy/NoteWindow.cs:603 +msgid "Find _Previous" +msgstr "Etsi _edellinen" + +#: ../Tomboy/NoteWindow.cs:762 +msgid "_Bold" +msgstr "_Voimakas" + +#: ../Tomboy/NoteWindow.cs:774 +msgid "_Italic" +msgstr "_Kursiivi" + +#: ../Tomboy/NoteWindow.cs:786 +msgid "_Strikeout" +msgstr "_Yliviivattu" + +#: ../Tomboy/NoteWindow.cs:798 +msgid "_Highlight" +msgstr "_Korostus" + +#: ../Tomboy/NoteWindow.cs:811 +msgid "Font Size" +msgstr "Kirjasimen koko" + +#: ../Tomboy/NoteWindow.cs:814 +msgid "_Normal" +msgstr "_Tavallinen" + +#: ../Tomboy/NoteWindow.cs:821 +msgid "Hu_ge" +msgstr "_Valtava" + +#: ../Tomboy/NoteWindow.cs:829 +msgid "_Large" +msgstr "_Suuri" + +#: ../Tomboy/NoteWindow.cs:837 +msgid "S_mall" +msgstr "_Pieni" + +#: ../Tomboy/Preferences.cs:127 +msgid "Tomboy Preferences" +msgstr "Tomboyn asetukset" + +#: ../Tomboy/Preferences.cs:141 +msgid "Editing" +msgstr "Muokkaus" + +#: ../Tomboy/Preferences.cs:144 +msgid "Hotkeys" +msgstr "Pikanäppäimet" + +#. Spellchecking... +#: ../Tomboy/Preferences.cs:184 +msgid "_Spellcheck While Typing" +msgstr "_Oikoluku kirjoitettaessa" + +#: ../Tomboy/Preferences.cs:191 +msgid "" +"Misspellings will be underlined in red, and correct spelling suggestions " +"shown in the right-click menu." +msgstr "" +"Väärin kirjoitetut alleviivataan punaisella ja oikeaa kirjoitusasua " +"ehdotetaan ponnahdusvalikossa." + +#. WikiWords... +#: ../Tomboy/Preferences.cs:200 +msgid "Highlight _WikiWords" +msgstr "Korosta _WikiSanat" + +#: ../Tomboy/Preferences.cs:207 +msgid "" +"Enable this option to highlight words ThatLookLikeThis. Clicking the " +"word will create a note with that name." +msgstr "" +"Käytä tätä asetusta korostamaan sanat, jotka NäyttävätSamalta. Sanaa " +"napsauttamalla saat luotua uuden muistilapun sanan nimellä." + +#. Custom font... +#: ../Tomboy/Preferences.cs:216 +msgid "Use Custom _Font" +msgstr "Käytä omaa _kirjasinta" + +#. Hotkeys... +#: ../Tomboy/Preferences.cs:286 +msgid "Listen for _Hotkeys" +msgstr "Käytä _pikanäppäimiä" + +#: ../Tomboy/Preferences.cs:294 +msgid "" +"Hotkeys allow you to quickly access your notes from anywhere with a " +"keypress. Example Hotkeys: <Control><Shift>F11, <" +"Alt>N" +msgstr "" +"Pikanäppäinten avulla pääset nopeasti käsiksi muistilappuihin yhdellä " +"näppäinyhdistelmällä. Esimerkkejä pikanäppämistä ovat <Control><" +"Shift>F11 ja <Alt>N" + +#. Show notes menu keybinding... +#: ../Tomboy/Preferences.cs:314 +msgid "Show notes _menu" +msgstr "Näytä muistilaput _valikossa" + +#. Open Start Here keybinding... +#: ../Tomboy/Preferences.cs:330 +msgid "Open \"_Start Here\"" +msgstr "Avaa \"_Aloita tästä\"" + +#. Create new note keybinding... +#: ../Tomboy/Preferences.cs:346 +msgid "Create _new note" +msgstr "Luo _uusi muistilappu" + +#. Search dialog keybinding... +#: ../Tomboy/Preferences.cs:362 +msgid "S_earch notes" +msgstr "_Etsi muistilapuista" + +#: ../Tomboy/Preferences.cs:424 +msgid "Choose Note Font" +msgstr "Valitse muistilapun kirjasin" + +#: ../Tomboy/RecentChanges.cs:31 +msgid "Recent Changes" +msgstr "Viimeisimmät muutokset" + +#: ../Tomboy/RecentChanges.cs:45 +msgid "" +"Recent Changes lists your notes in the order they were last changed. " +"Double click to open a note." +msgstr "" +"Viimeisimmät muutokset luetteloi muistilappusi siinä järjestyksessä " +"jossa niitä viimeksi muutettiin. Kaksoisnapauta avataksesi muistilappu." + +#: ../Tomboy/RecentChanges.cs:171 +msgid "Last Changed" +msgstr "Viimeksi muutettu" + +#: ../Tomboy/RecentChanges.cs:234 +#, csharp-format +msgid "Today, {0}" +msgstr "Tänään, {0}" + +#: ../Tomboy/RecentChanges.cs:237 +#, csharp-format +msgid "Yesterday, {0}" +msgstr "Eilen, {0}" + +#: ../Tomboy/RecentChanges.cs:240 +#, csharp-format +msgid "{0} days ago, {1}" +msgstr "{0} päivää sitten, {1}" + +#: ../Tomboy/RecentChanges.cs:244 +msgid "MMMM d, h:mm tt" +msgstr "MMMM dd, hh::mm tt" + +#: ../Tomboy/RecentChanges.cs:246 +msgid "MMMM d yyyy, h:mm tt" +msgstr "MMMM dd vuosi, hh:mm:tt" + +#: ../Tomboy/Search.cs:87 ../Tomboy/Search.cs:488 +msgid "Search All Notes" +msgstr "Etsi kaikista muistilapuista" + +#: ../Tomboy/Search.cs:88 ../Tomboy/Search.cs:492 +msgid "Search Note" +msgstr "Etsi muistilapusta" + +#: ../Tomboy/Search.cs:109 +msgid "_Find:" +msgstr "_Etsi:" + +#: ../Tomboy/Search.cs:113 +msgid "Search _All Notes" +msgstr "Etsi _kaikista muistilapuista" + +#: ../Tomboy/Search.cs:119 +msgid "Case _Sensitive" +msgstr "Erottele _kirjainkoko" + +#: ../Tomboy/Search.cs:164 +msgid "_Previous" +msgstr "_Edellinen" + +#: ../Tomboy/Search.cs:252 +msgid "Search _Results" +msgstr "Haun _tulokset" + +#: ../Tomboy/Search.cs:746 +#, csharp-format +msgid "({0} match)" +msgid_plural "({0} matches)" +msgstr[0] "({0} osuma)" +msgstr[1] "({0} osumaa)" + +#. title +#: ../Tomboy/Search.cs:764 +msgid "No notes found" +msgstr "Muistilappuja ei löytynyt" + +#: ../Tomboy/Tomboy.cs:138 +msgid "" +"Tomboy: A simple, easy to use desktop note-taking application.\n" +"Copyright (C) 2004, 2005 Alex Graveley <alex(a)beatniksoftware.com>\n" +"\n" +msgstr "" +"Tomboy: Yksinkertainen ja helppokäyttöinen muistilappusovellus.\n" +"Copyright (C) 2004, 2005 Alex Graveley <alex(a)beatniksoftware.com>\n" +"\n" + +#: ../Tomboy/Tomboy.cs:149 +msgid "" +"Usage:\n" +" --new-note\t\t\tCreate and display a new note.\n" +" --new-note [title]\t\tCreate and display a new note, with a title.\n" +" --open-note [title/url]\tDisplay the existing note matching title.\n" +" --start-here\t\t\tDisplay the 'Start Here' note.\n" +" --highlight-search [text]\tSearch and highlight text in the opened note.\n" +" --version\t\t\tPrint version information.\n" +" --help\t\t\tPrint this usage message.\n" +msgstr "" +"Käyttö:\n" +" --new-note\t\t\tLuo ja näytä uusi muistilappu.\n" +" --new-note [nimi]\t\t Luo ja näytä uusi muistilappu annetulla nimiellä.\n" +" --open-note [nimi/url\tNäytä olemassaoleva, vastaava muistilapu.\n" +" --start-here\t\t\tNäytä muistilappu \"Aloita tästä\".\n" +" --highlight-search [teksti]\tEtsi ja korosta teksti avatussa " +"muistilapussa.\n" +" --version\t\t\tNäytä versiotiedot.\n" +" --help\t\t\tNäytä tämä ohje.\n" + +#: ../Tomboy/Tomboy.cs:161 +msgid "" +"Usage:\n" +" --version\t\t\tPrint version information.\n" +" --help\t\t\tPrint this usage message.\n" +"\n" +"D-BUS remote control disabled." +msgstr "" +"Käyttö:\n" +" --version\t\t\tNäytä versiotiedot.\n" +" --help\t\t\tNäytä tämä ohje.\n" +"\n" +"D-BUS-etäohjaus poistettu käytöstä." + +#: ../Tomboy/Tomboy.cs:172 +#, csharp-format +msgid "Version {0}" +msgstr "Versio {0}" + +#: ../Tomboy/Tomboy.cs:229 +#, csharp-format +msgid "" +"Tomboy: unsupported option '{0}'\n" +"Try 'tomboy --help' for more information.\n" +"D-BUS remote control disabled." +msgstr "" +"Tomboy: tuntematon valitsin \"{0}\"\n" +"Katso lisätietoja komennolla \"tomboy --help\".\n" +"D-BUS-etähallinta poissa käytöstä." + +#: ../Tomboy/Tray.cs:77 +msgid "Create _New Note" +msgstr "Luo _uusi muistilappu" + +#: ../Tomboy/Tray.cs:125 +msgid "_Recent Changes" +msgstr "_Viimeisimmät muutokset" + +#: ../Tomboy/Tray.cs:135 +msgid "_Search Notes..." +msgstr "_Etsi muistilapuista..." + +#: ../Tomboy/Tray.cs:153 +msgid " (new)" +msgstr " (uusi)" + +#: ../Tomboy/Tray.cs:230 +msgid "translator-credits" +msgstr "" +"Ilkka Tuohela, 2005\n" +"\n" +"http://www.gnome.fi/" + +#: ../Tomboy/Tray.cs:236 +msgid "Copyright © 2004, 2005 Alex Graveley" +msgstr "Copyright © 2004, 2005 Alex Graveley" + +#: ../Tomboy/Tray.cs:237 +msgid "A simple and easy to use desktop note-taking application." +msgstr "Yksinkertainen ja helppokäyttöinen muistilappusovellus." + +#. initial newline +#: ../Tomboy/Tray.cs:286 +msgid "dddd, MMMM d, h:mm tt" +msgstr "dddd, MMMM d, hh:mm tt" + +#: ../Tomboy/Watchers.cs:138 +#, csharp-format +msgid "(Untitled {0})" +msgstr "(Nimeämätön {0})" + +#: ../Tomboy/Watchers.cs:166 +#, csharp-format +msgid "" +"A note with the title {0} already exists. Please choose another name " +"for this note before continuing." +msgstr "" +"Muistilappu nimellä {0} on jo olemassa. Valitse tällä muistilapulle " +"toinen nimi ennen kuin jatkat." + +#: ../Tomboy/Watchers.cs:178 +msgid "Note title taken" +msgstr "Muistilapun nimi käytössä" + +#: ../Tomboy/Watchers.cs:428 +msgid "Cannot open location" +msgstr "Sijaintia ei voi avata" + +#: ../Tomboy/Watchers.cs:536 +msgid "_Copy Link Address" +msgstr "_Kopioi linkin osoite" + +#: ../Tomboy/Watchers.cs:541 +msgid "_Open Link" +msgstr "_Avaa linkki" + +#: ../Tomboy/Plugins/ExportToHTML.cs:46 +msgid "Export to HTML" +msgstr "Vie HTML-tiedostoon" + +#: ../Tomboy/Plugins/ExportToHTML.cs:164 +msgid "Destination for HTML Export" +msgstr "HTML-viennin kohde" + +#: ../Tomboy/Plugins/ExportToHTML.cs:169 +msgid "Export linked notes" +msgstr "Vie linkitetyt muistilaput" Binary files old/po/fr.gmo and new/po/fr.gmo differ Binary files old/po/hu.gmo and new/po/hu.gmo differ Binary files old/po/is.gmo and new/po/is.gmo differ Binary files old/po/it.gmo and new/po/it.gmo differ Binary files old/po/ja.gmo and new/po/ja.gmo differ Binary files old/po/ko.gmo and new/po/ko.gmo differ Binary files old/po/lt.gmo and new/po/lt.gmo differ Binary files old/po/messages.mo and new/po/messages.mo differ Binary files old/po/nb.gmo and new/po/nb.gmo differ Binary files old/po/nl.gmo and new/po/nl.gmo differ Binary files old/po/no.gmo and new/po/no.gmo differ Binary files old/po/pa.gmo and new/po/pa.gmo differ Binary files old/po/pl.gmo and new/po/pl.gmo differ Binary files old/po/pt_BR.gmo and new/po/pt_BR.gmo differ Binary files old/po/rw.gmo and new/po/rw.gmo differ Binary files old/po/sq.gmo and new/po/sq.gmo differ Binary files old/po/sv.gmo and new/po/sv.gmo differ Binary files old/po/tr.gmo and new/po/tr.gmo differ Binary files old/po/uk.gmo and new/po/uk.gmo differ Binary files old/po/zh_CN.gmo and new/po/zh_CN.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/zh_TW.po new/po/zh_TW.po --- old/po/zh_TW.po 1970-01-01 01:00:00.000000000 +0100 +++ new/po/zh_TW.po 2006-05-30 22:20:46.000000000 +0200 @@ -0,0 +1,712 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: tomboy\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-04-25 22:01+0200\n" +"PO-Revision-Date: 2006-05-17 17:14\n" +"Last-Translator: Novell Language <language(a)novell.com>\n" +"Language-Team: Novell Language <language(a)novell.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/DefaultPlugins.desktop.in.in.h:1 +msgid "Default Plugins" +msgstr "預設的外掛程式" + +#: ../data/DefaultPlugins.desktop.in.in.h:2 +msgid "Directory containing system-installed Plugins" +msgstr "包含系統安裝外掛程式的目錄" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:1 +msgid "Accessories" +msgstr "附屬程式" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:2 +msgid "Simple and easy to use note-taking" +msgstr "簡單且方便地操作記事工作" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:3 +msgid "Tomboy Applet Factory" +msgstr "Tomboy Applet Factory" + +#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3 +#: ../Tomboy/Applet.cs:134 ../Tomboy/Tray.cs:38 +msgid "Tomboy Notes" +msgstr "Tomboy 記事" + +#: ../data/GNOME_TomboyApplet.xml.h:1 +msgid "_About Tomboy..." +msgstr "關於 Tomboy(_A)..." + +#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/Applet.cs:175 +#: ../Tomboy/NoteWindow.cs:547 +msgid "_Open Plugins Folder" +msgstr "開啟外掛程式資料夾(_O)" + +#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/Applet.cs:170 +msgid "_Preferences..." +msgstr "優先設定(_P)?" + +#: ../data/tomboy.desktop.in.h:1 +msgid "Note-taker" +msgstr "記事程式" + +#: ../data/tomboy.desktop.in.h:2 +msgid "Quick and handy note-taker" +msgstr "隨時可快速使用的記事程式" + +#: ../data/tomboy.schemas.in.h:1 +msgid "Create a new Note" +msgstr "建立新記事" + +#: ../data/tomboy.schemas.in.h:2 +msgid "Custom Font Face" +msgstr "自訂字型屬性" + +#: ../data/tomboy.schemas.in.h:3 +msgid "Enable WikiWord highlighting" +msgstr "啟用 WikiWord 反白功能" + +#: ../data/tomboy.schemas.in.h:4 +msgid "Enable custom font" +msgstr "啟用自訂字型" + +#: ../data/tomboy.schemas.in.h:5 +msgid "Enable global keybindings" +msgstr "啟用全域按鍵關聯" + +#: ../data/tomboy.schemas.in.h:6 +msgid "Enable spellchecking" +msgstr "啟用拼字檢查功能" + +#: ../data/tomboy.schemas.in.h:7 +msgid "" +"Enable this option to highlight words ThatLookLikeThis. Clicking the word " +"will create a note with that name." +msgstr "" +"啟用這個選項來反白選取 ThatLookLikeThis 單字。按一下這個單字就會建立使用該名" +"稱的記事。" + +#: ../data/tomboy.schemas.in.h:8 +msgid "HTML Export Last Directory" +msgstr "上次 HTML 匯出目錄" + +#: ../data/tomboy.schemas.in.h:9 +msgid "HTML Export Linked Notes" +msgstr "已連結 HTML 匯出記事" + +#: ../data/tomboy.schemas.in.h:10 +msgid "" +"If enable_custom_font is true, the font name set here will be used as the " +"font when displaying notes." +msgstr "" +"如果 enable_custom_font 是 True，記事顯示時所使用的字型就會是此處的字型名稱設" +"定。" + +#: ../data/tomboy.schemas.in.h:11 +msgid "" +"If true, misspellings will be underlined in red, and correct spelling " +"suggestions shown in the right-click menu." +msgstr "" +"如果是 True，拼錯的單字就會加上紅色底線，而且在按一下右鍵所出現的功能表中顯示" +"正確的拼字建議。" + +#: ../data/tomboy.schemas.in.h:12 +msgid "" +"If true, the desktop-global keybindings set in /apps/tomboy/" +"global_keybindings will be enabled, allowing for useful Tomboy actions to be " +"available from any application." +msgstr "" +"如果是 True，桌面就會啟用 /apps/tomboy/global_keybindings 中的桌面全域按鍵關" +"聯設定，允許使用者從任何應用程式使用有效的 Tomboy 動作。" + +#: ../data/tomboy.schemas.in.h:13 +msgid "" +"If true, the font name set in custom_font_face will be used as the font when " +"displaying notes. Otherwise the desktop default font will be used." +msgstr "" +"如果是 True，顯示記事時的字型就會使用 custom_font_face 中的字型名稱設定。否" +"則，將會使用桌面的預設字型。" + +#: ../data/tomboy.schemas.in.h:14 +msgid "Open Recent Changes" +msgstr "開啟最近的變更" + +#: ../data/tomboy.schemas.in.h:15 +msgid "Open Search Dialog" +msgstr "開啟搜尋對話方塊" + +#: ../data/tomboy.schemas.in.h:16 +msgid "Open Start Here" +msgstr "開啟從這裡開始" + +#: ../data/tomboy.schemas.in.h:17 +msgid "Show applet menu" +msgstr "顯示 Applet 功能表 " + +#: ../data/tomboy.schemas.in.h:18 +msgid "" +"The global keybinding for creating and displaying a new Note. The format " +"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The " +"parser is fairly liberal and allows lower or upper case, and also " +"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the " +"option to the special string \"disabled\", then there will be no keybinding " +"for this action." +msgstr "" +"可用來建立和顯示新記事的全域按鍵關聯。這個格式看起來很像 \"<Control>a" +"\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使用小寫或大寫" +"的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的縮寫。當您將" +"此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按鍵關聯。" + +#: ../data/tomboy.schemas.in.h:19 +msgid "" +"The global keybinding for opening the \"Start Here\" note. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"可用來開啟「從這裡開始」記事的全域按鍵關聯。這個格式看起來很像 \"<" +"Control>a\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使" +"用小寫或大寫的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的" +"縮寫。當您將此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按" +"鍵關聯。" + +#: ../data/tomboy.schemas.in.h:20 +msgid "" +"The global keybinding for opening the Note Search dialog. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"可用來開啟「記事搜尋」對話方塊的全域按鍵關聯。這個格式看起來很像 \"<" +"Control>a\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使" +"用小寫或大寫的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的" +"縮寫。當您將此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按" +"鍵關聯。" + +#: ../data/tomboy.schemas.in.h:21 +msgid "" +"The global keybinding for opening the Recent Changes dialog. The format " +"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The " +"parser is fairly liberal and allows lower or upper case, and also " +"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the " +"option to the special string \"disabled\", then there will be no keybinding " +"for this action." +msgstr "" +"可用來開啟「最近的變更」對話方塊的全域按鍵關聯。這個格式看起來很像 \"<" +"Control>a\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使" +"用小寫或大寫的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的" +"縮寫。當您將此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按" +"鍵關聯。" + +#: ../data/tomboy.schemas.in.h:22 +msgid "" +"The global keybinding for showing the Tomboy applet's menu. The format looks " +"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is " +"fairly liberal and allows lower or upper case, and also abbreviations such " +"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the " +"special string \"disabled\", then there will be no keybinding for this " +"action." +msgstr "" +"可用來顯示 Tomboy Applet 功能表的全域按鍵關聯。這個格式看起來很像 \"<" +"Control>a\" 或 \"<Shift><Alt>F1\"。此剖析器相當開放，其允許使" +"用小寫或大寫的字母，同時也可以使用類似 \"<Ctl>\" 和 \"<Ctrl>\" 的" +"縮寫。當您將此選項設定為特殊字串「停用 (disabled)」，這個動作就不會提供任何按" +"鍵關聯。" + +#: ../data/tomboy.schemas.in.h:23 +msgid "" +"The last directory a note was exported to using the Export To HTML plugin." +msgstr "上一次使用「匯出成 HTML」外掛程式將記事匯入其中的目錄。" + +#: ../data/tomboy.schemas.in.h:24 +msgid "" +"The last setting for the 'Export linked notes' checkbox in the Export to " +"HTML plugin." +msgstr "在「匯出成 HTML」外掛程式中上一次「已連結匯出記事」核取方塊的設定。" + +#: ../libtomboy/gedit-print.c:144 ../Tomboy/Plugins/PrintNotes.cs:15 +msgid "Print" +msgstr "Print" + +#: ../libtomboy/gedit-print.c:243 +msgid "Preparing pages..." +msgstr "正在準備頁面..." + +#: ../libtomboy/gedit-print.c:270 +#, c-format +msgid "Rendering page %d of %d..." +msgstr "正在轉換頁面 %d (共 %d 頁)..." + +#: ../libtomboy/gedit-print.c:272 +#, c-format +msgid "Printing page %d of %d..." +msgstr "正在列印頁面 %d (共 %d 頁)..." + +#: ../libtomboy/gedit-print.c:294 +msgid "Print preview" +msgstr "列印預覽" + +#: ../libtomboy/gedit-print.c:446 +msgid "Page %N of %Q" +msgstr "第 %N 頁 (共 %Q 頁)" + +#: ../libtomboy/gedit-print.c:448 +msgid "%A %D, %I:%M %p" +msgstr "%A %D、%I:%M %p" + +#: ../Tomboy/Applet.cs:180 +msgid "_About Tomboy" +msgstr "關於 Tomboy(_A)" + +#: ../Tomboy/Applet.cs:187 +msgid "_Quit" +msgstr "結束(_Q)" + +#. Open the Start Here note +#: ../Tomboy/Note.cs:393 ../Tomboy/NoteManager.cs:89 +#: ../Tomboy/NoteManager.cs:96 ../Tomboy/Tomboy.cs:210 ../Tomboy/Tray.cs:112 +#: ../Tomboy/Tray.cs:278 ../Tomboy/XKeybinder.cs:259 +msgid "Start Here" +msgstr "從這裡開始" + +#: ../Tomboy/NoteManager.cs:90 +msgid "Welcome to Tomboy!" +msgstr "歡迎使用 Tomboy！" + +#: ../Tomboy/NoteManager.cs:91 +msgid "" +"Use this page as a Start Page for organizing your notes and keeping " +"unorganized ideas around." +msgstr "使用這個頁面作為「起始頁面」來管理記事，並將尚未組織的想法安排在周圍。" + +#: ../Tomboy/NoteManager.cs:153 +#, csharp-format +msgid "New Note {0}" +msgstr "新增記事 {0}" + +#: ../Tomboy/NoteManager.cs:170 +msgid "Describe your new note here." +msgstr "在這裡描述新記事。" + +#: ../Tomboy/NoteWindow.cs:313 +msgid "Really delete this note?" +msgstr "確實要刪除這份記事嗎?" + +#: ../Tomboy/NoteWindow.cs:314 +msgid "If you delete a note it is permanently lost." +msgstr "刪除記事之後將會永久遺失。" + +#: ../Tomboy/NoteWindow.cs:398 +msgid "_Link to New Note" +msgstr "連結到新記事(_L)" + +#: ../Tomboy/NoteWindow.cs:411 +msgid "Te_xt" +msgstr "文字(_X)" + +#: ../Tomboy/NoteWindow.cs:419 +msgid "_Search" +msgstr "搜尋(_S)" + +#: ../Tomboy/NoteWindow.cs:433 +msgid "Clos_e All Notes" +msgstr "關閉所有記事(_E)" + +#: ../Tomboy/NoteWindow.cs:443 +msgid "_Close" +msgstr "關閉(_C)" + +#: ../Tomboy/NoteWindow.cs:471 +msgid "Search" +msgstr "搜尋" + +#: ../Tomboy/NoteWindow.cs:472 +msgid "Search your notes" +msgstr "搜尋您的記事" + +#: ../Tomboy/NoteWindow.cs:484 +msgid "Link" +msgstr "連結" + +#: ../Tomboy/NoteWindow.cs:485 +msgid "Link selected text to a new note" +msgstr "連結選定文字到新記事" + +#: ../Tomboy/NoteWindow.cs:499 +msgid "_Text" +msgstr "文字(_T)" + +#: ../Tomboy/NoteWindow.cs:504 +msgid "Set properties of text" +msgstr "設定文字的內容" + +#: ../Tomboy/NoteWindow.cs:510 +msgid "_Plugins" +msgstr "外掛程式(_P)" + +#: ../Tomboy/NoteWindow.cs:514 +msgid "Run Plugin actions" +msgstr "執行外掛程式動作" + +#: ../Tomboy/NoteWindow.cs:521 +msgid "Delete" +msgstr "刪除(D)" + +#: ../Tomboy/NoteWindow.cs:522 +msgid "Delete this note" +msgstr "刪除這份記事" + +#: ../Tomboy/NoteWindow.cs:579 +msgid "_Search..." +msgstr "搜尋(_S)..." + +#: ../Tomboy/NoteWindow.cs:590 ../Tomboy/Search.cs:176 +msgid "Find _Next" +msgstr "尋找下一個(_N)" + +#: ../Tomboy/NoteWindow.cs:603 +msgid "Find _Previous" +msgstr "尋找上一個(_P)" + +#: ../Tomboy/NoteWindow.cs:762 +msgid "_Bold" +msgstr "粗體(_B)" + +#: ../Tomboy/NoteWindow.cs:774 +msgid "_Italic" +msgstr "斜體(_I)" + +#: ../Tomboy/NoteWindow.cs:786 +msgid "_Strikeout" +msgstr "刪除線(_S)" + +#: ../Tomboy/NoteWindow.cs:798 +msgid "_Highlight" +msgstr "反白(_H)" + +#: ../Tomboy/NoteWindow.cs:811 +msgid "Font Size" +msgstr "字型大小" + +#: ../Tomboy/NoteWindow.cs:814 +msgid "_Normal" +msgstr "一般(_N)" + +#: ../Tomboy/NoteWindow.cs:821 +msgid "Hu_ge" +msgstr "超大(_G)" + +#: ../Tomboy/NoteWindow.cs:829 +msgid "_Large" +msgstr "大(_L)" + +#: ../Tomboy/NoteWindow.cs:837 +msgid "S_mall" +msgstr "小(_M)" + +#: ../Tomboy/Preferences.cs:127 +msgid "Tomboy Preferences" +msgstr "Tomboy 優先設定" + +#: ../Tomboy/Preferences.cs:141 +msgid "Editing" +msgstr "編輯" + +#: ../Tomboy/Preferences.cs:144 +msgid "Hotkeys" +msgstr "熱鍵" + +#. Spellchecking... +#: ../Tomboy/Preferences.cs:184 +msgid "_Spellcheck While Typing" +msgstr "輸入時執行拼字檢查" + +#: ../Tomboy/Preferences.cs:191 +msgid "" +"Misspellings will be underlined in red, and correct spelling suggestions " +"shown in the right-click menu." +msgstr "" +"拼錯的單字就會加上紅色底線，而且在按一下右鍵所出現的功能表中顯示正確的拼字建" +"議。" + +#. WikiWords... +#: ../Tomboy/Preferences.cs:200 +msgid "Highlight _WikiWords" +msgstr "反白 WikiWords(_W)" + +#: ../Tomboy/Preferences.cs:207 +msgid "" +"Enable this option to highlight words ThatLookLikeThis. Clicking the " +"word will create a note with that name." +msgstr "" +"啟用這個選項來反白選取 ThatLookLikeThis 單字。按一下這個單字就會建立使" +"用該名稱的記事。" + +#. Custom font... +#: ../Tomboy/Preferences.cs:216 +msgid "Use Custom _Font" +msgstr "使用自訂字型(_F)" + +#. Hotkeys... +#: ../Tomboy/Preferences.cs:286 +msgid "Listen for _Hotkeys" +msgstr "接聽熱鍵(_H)" + +#: ../Tomboy/Preferences.cs:294 +msgid "" +"Hotkeys allow you to quickly access your notes from anywhere with a " +"keypress. Example Hotkeys: <Control><Shift>F11, <" +"Alt>N" +msgstr "" +"您可以應用熱鍵，從任何位置按一下按鍵來快速存取您的記事。範例熱鍵：<" +"Control><Shift>F11、<Alt>N" + +#. Show notes menu keybinding... +#: ../Tomboy/Preferences.cs:314 +msgid "Show notes _menu" +msgstr "顯示記事功能表(_M)" + +#. Open Start Here keybinding... +#: ../Tomboy/Preferences.cs:330 +msgid "Open \"_Start Here\"" +msgstr "開啟「從這裡開始」" + +#. Create new note keybinding... +#: ../Tomboy/Preferences.cs:346 +msgid "Create _new note" +msgstr "建立新記事(_N)" + +#. Search dialog keybinding... +#: ../Tomboy/Preferences.cs:362 +msgid "S_earch notes" +msgstr "搜尋記事(_E)" + +#: ../Tomboy/Preferences.cs:424 +msgid "Choose Note Font" +msgstr "選擇記事字型" + +#: ../Tomboy/RecentChanges.cs:31 +msgid "Recent Changes" +msgstr "最近的變更" + +#: ../Tomboy/RecentChanges.cs:45 +msgid "" +"Recent Changes lists your notes in the order they were last changed. " +"Double click to open a note." +msgstr "" +"「最近的變更」會依據記事上次的變更日期依序列出。按兩下滑鼠便可開啟記" +"事。" + +#: ../Tomboy/RecentChanges.cs:171 +msgid "Last Changed" +msgstr "上次變更" + +#: ../Tomboy/RecentChanges.cs:234 +#, csharp-format +msgid "Today, {0}" +msgstr "今天，{0}" + +#: ../Tomboy/RecentChanges.cs:237 +#, csharp-format +msgid "Yesterday, {0}" +msgstr "昨天，{0}" + +#: ../Tomboy/RecentChanges.cs:240 +#, csharp-format +msgid "{0} days ago, {1}" +msgstr "{0} 天以前，{1}" + +#: ../Tomboy/RecentChanges.cs:244 +msgid "MMMM d, h:mm tt" +msgstr "MMMM d, h:mm tt" + +#: ../Tomboy/RecentChanges.cs:246 +msgid "MMMM d yyyy, h:mm tt" +msgstr "MMMM d yyyy, h:mm tt" + +#: ../Tomboy/Search.cs:87 ../Tomboy/Search.cs:488 +msgid "Search All Notes" +msgstr "搜尋全部記事" + +#: ../Tomboy/Search.cs:88 ../Tomboy/Search.cs:492 +msgid "Search Note" +msgstr "搜尋記事" + +#: ../Tomboy/Search.cs:109 +msgid "_Find:" +msgstr "尋找(_F)：" + +#: ../Tomboy/Search.cs:113 +msgid "Search _All Notes" +msgstr "搜尋全部記事(_A)" + +#: ../Tomboy/Search.cs:119 +msgid "Case _Sensitive" +msgstr "區分大小寫(_S)" + +#: ../Tomboy/Search.cs:164 +msgid "_Previous" +msgstr "上一個(_P)" + +#: ../Tomboy/Search.cs:252 +msgid "Search _Results" +msgstr "搜尋結果(_R)" + +#: ../Tomboy/Search.cs:746 +#, csharp-format +msgid "({0} match)" +msgid_plural "({0} matches)" +msgstr[0] "({0} 個符合)" +msgstr[1] "({0} 個符合)" + +#. title +#: ../Tomboy/Search.cs:764 +msgid "No notes found" +msgstr "找不到任何記事" + +#: ../Tomboy/Tomboy.cs:138 +msgid "" +"Tomboy: A simple, easy to use desktop note-taking application.\n" +"Copyright (C) 2004, 2005 Alex Graveley <alex(a)beatniksoftware.com>\n" +"\n" +msgstr "" +"Tomboy：簡單又方便操作的桌面記事應用程式。\n" +"Copyright (C) 2004, 2005 Alex Graveley <alex(a)beatniksoftware.com>\n" +"\n" + +#: ../Tomboy/Tomboy.cs:149 +msgid "" +"Usage:\n" +" --new-note\t\t\tCreate and display a new note.\n" +" --new-note [title]\t\tCreate and display a new note, with a title.\n" +" --open-note [title/url]\tDisplay the existing note matching title.\n" +" --start-here\t\t\tDisplay the 'Start Here' note.\n" +" --highlight-search [text]\tSearch and highlight text in the opened note.\n" +" --version\t\t\tPrint version information.\n" +" --help\t\t\tPrint this usage message.\n" +msgstr "" +"使用方式：\n" +" --new-note\t\t\t建立並顯示新記事。\n" +" --new-note [標題]\t\t在提供標題情況下建立並顯示新記事。\n" +" --open-note [標題/url]\t顯示符合標題的現有記事。\n" +" --start-here\t\t\t顯示「從這裡開始」記事。\n" +" --highlight-search [文字]\t在開啟的記事中，搜尋並反白選取特定文字。\n" +" --version\t\t\t列印版本資訊。\n" +" --help\t\t\t列印這份使用方式訊息。\n" + +#: ../Tomboy/Tomboy.cs:161 +msgid "" +"Usage:\n" +" --version\t\t\tPrint version information.\n" +" --help\t\t\tPrint this usage message.\n" +"\n" +"D-BUS remote control disabled." +msgstr "" +"使用方式：\n" +" --version\t\t\t列印版本資訊。\n" +" --help\t\t\t列印這份使用方式訊息。\n" +"\n" +"D-BUS 遠端控制功能已停用。" + +#: ../Tomboy/Tomboy.cs:172 +#, csharp-format +msgid "Version {0}" +msgstr "版本 {0}" + +#: ../Tomboy/Tomboy.cs:229 +#, csharp-format +msgid "" +"Tomboy: unsupported option '{0}'\n" +"Try 'tomboy --help' for more information.\n" +"D-BUS remote control disabled." +msgstr "" +"Tomboy：不支援的選項 '{0}'\n" +"請嘗試 'tomboy --help' 取得更多詳細資訊。\n" +"D-BUS 遠端控制功能已停用。" + +#: ../Tomboy/Tray.cs:77 +msgid "Create _New Note" +msgstr "建立新記事(_N)" + +#: ../Tomboy/Tray.cs:125 +msgid "_Recent Changes" +msgstr "最近的變更(_R)" + +#: ../Tomboy/Tray.cs:135 +msgid "_Search Notes..." +msgstr "搜尋記事(_S)..." + +#: ../Tomboy/Tray.cs:153 +msgid " (new)" +msgstr " (新)" + +#: ../Tomboy/Tray.cs:230 +msgid "translator-credits" +msgstr "translator-credits" + +#: ../Tomboy/Tray.cs:236 +#, fuzzy +msgid "Copyright © 2004, 2005 Alex Graveley" +msgstr "Copyright (c) 2004, 2005 Alex Graveley" + +#: ../Tomboy/Tray.cs:237 +msgid "A simple and easy to use desktop note-taking application." +msgstr "簡單又方便操作的桌面記事應用程式。" + +#. initial newline +#: ../Tomboy/Tray.cs:286 +msgid "dddd, MMMM d, h:mm tt" +msgstr "dddd, MMMM d, h:mm tt" + +#: ../Tomboy/Watchers.cs:138 +#, csharp-format +msgid "(Untitled {0})" +msgstr "(無標題 {0})" + +#: ../Tomboy/Watchers.cs:166 +#, csharp-format +msgid "" +"A note with the title {0} already exists. Please choose another name " +"for this note before continuing." +msgstr "" +"已經存在包含標題 {0} 的記事。請先為這份記事選擇其他名稱，再繼續進行。" + +#: ../Tomboy/Watchers.cs:178 +msgid "Note title taken" +msgstr "已記錄的記事標題" + +#: ../Tomboy/Watchers.cs:428 +msgid "Cannot open location" +msgstr "無法開啟位置" + +#: ../Tomboy/Watchers.cs:536 +msgid "_Copy Link Address" +msgstr "複製連結位址(_C)" + +#: ../Tomboy/Watchers.cs:541 +msgid "_Open Link" +msgstr "開啟連結(_O)" + +#: ../Tomboy/Plugins/ExportToHTML.cs:46 +msgid "Export to HTML" +msgstr "匯出成 HTML" + +#: ../Tomboy/Plugins/ExportToHTML.cs:164 +msgid "Destination for HTML Export" +msgstr "HTML 匯出目的地" + +#: ../Tomboy/Plugins/ExportToHTML.cs:169 +msgid "Export linked notes" +msgstr "已連結匯出記事" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit thinkeramik
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package thinkeramik checked in at Wed May 31 02:56:45 CEST 2006. -------- --- KDE/thinkeramik/thinkeramik.changes 2006-01-27 15:33:52.000000000 +0100 +++ thinkeramik/thinkeramik.changes 2006-05-30 07:37:47.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:37:42 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thinkeramik.spec ++++++ --- /var/tmp/diff_new_pack.qUu2ei/_old 2006-05-31 02:56:38.000000000 +0200 +++ /var/tmp/diff_new_pack.qUu2ei/_new 2006-05-31 02:56:38.000000000 +0200 @@ -5,19 +5,22 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: thinkeramik BuildRequires: kdebase3-devel +%if %suse_version < 1010 +BuildRequires: update-desktop-files +%endif URL: http://prefsx1.hp.infoseek.co.jp/tk040429/index.html License: GPL Group: System/GUI/KDE -Summary: Thin Keramik style for Qt/KDE +Summary: Thin Keramik style for KDE Version: 3.2.1 -Release: 9 +Release: 23 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: thinkeramik-style Source0: %{name}-%{version}.tar.bz2 @@ -42,7 +45,7 @@ %package style Group: System/GUI/KDE -Summary: Thin Keramik style for Qt/KDE +Summary: Thin Keramik style for Qt %description style This is a plain-looking modification of the Keramik style. @@ -109,6 +112,8 @@ /usr/lib/qt3/plugins/styles %changelog -n thinkeramik +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Fri Jan 27 2006 - dmueller(a)suse.de - fix sequence point warnings (#137753) * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit tellico
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package tellico checked in at Wed May 31 02:56:37 CEST 2006. -------- --- KDE/tellico/tellico.changes 2006-05-16 12:00:31.000000000 +0200 +++ tellico/tellico.changes 2006-05-30 07:17:51.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 07:17:46 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tellico.spec ++++++ --- /var/tmp/diff_new_pack.AJsb14/_old 2006-05-31 02:56:29.000000000 +0200 +++ /var/tmp/diff_new_pack.AJsb14/_new 2006-05-31 02:56:29.000000000 +0200 @@ -12,9 +12,12 @@ Name: tellico BuildRequires: kdemultimedia3-CD kdemultimedia3-devel libyaz-devel taglib-devel tcpd-devel +%if %suse_version < 1010 +BuildRequires: libgcrypt-devel openssl-devel update-desktop-files +%endif Summary: A book collection manager Version: 1.1.6 -Release: 2 +Release: 4 License: GPL Group: Productivity/Other Source: %{name}-%{version}.tar.gz @@ -69,6 +72,8 @@ %defattr(-,root,root,0755) %changelog -n tellico +* Tue May 30 2006 - adrian(a)suse.de +- fix build for < 10.1 * Fri May 12 2006 - stbinner(a)suse.de - Update to version 1.1.6 * Fixed bug that prevented images from being saved in certain ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0