November 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-trans-cs
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-trans-cs checked in at Fri Nov 28 16:17:02 CET 2008. -------- --- yast2-trans-cs/yast2-trans-cs.changes 2008-11-21 13:52:58.000000000 +0100 +++ yast2-trans-cs/yast2-trans-cs.changes 2008-11-28 16:06:47.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 28 16:06:47 CET 2008 - ke(a)suse.de + +- Update to version 2.17.7. + +------------------------------------------------------------------------ calling whatdependson for head-i586 Old: ---- yast2-trans-cs-2.17.6.tar.bz2 New: ---- yast2-trans-cs-2.17.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-cs.spec ++++++ --- /var/tmp/diff_new_pack.X20486/_old 2008-11-28 16:16:53.000000000 +0100 +++ /var/tmp/diff_new_pack.X20486/_new 2008-11-28 16:16:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-cs (Version 2.17.6) +# spec file for package yast2-trans-cs (Version 2.17.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-trans-cs -Version: 2.17.6 +Version: 2.17.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-cs-2.17.6.tar.bz2 +Source0: yast2-trans-cs-2.17.7.tar.bz2 Prefix: /usr Provides: locale(yast2:cs) BuildRequires: pkgconfig yast2-devtools @@ -37,7 +37,7 @@ %prep -%setup -n yast2-trans-cs-2.17.6 +%setup -n yast2-trans-cs-2.17.7 %build autoreconf --force --install @@ -57,6 +57,8 @@ %dir /usr/share/YaST2/locale %lang(cs) /usr/share/YaST2/locale/cs %changelog +* Fri Nov 28 2008 ke(a)suse.de +- Update to version 2.17.7. * Fri Nov 21 2008 ke(a)suse.de - Update to version 2.17.6. * Fri Oct 24 2008 ke(a)suse.de ++++++ yast2-trans-cs-2.17.6.tar.bz2 -> yast2-trans-cs-2.17.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-cs-2.17.6/configure new/yast2-trans-cs-2.17.7/configure --- old/yast2-trans-cs-2.17.6/configure 2008-11-21 13:53:09.000000000 +0100 +++ new/yast2-trans-cs-2.17.7/configure 2008-11-28 16:07:01.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-trans-cs 2.17.6. +# Generated by GNU Autoconf 2.63 for yast2-trans-cs 2.17.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-cs' PACKAGE_TARNAME='yast2-trans-cs' -PACKAGE_VERSION='2.17.6' -PACKAGE_STRING='yast2-trans-cs 2.17.6' +PACKAGE_VERSION='2.17.7' +PACKAGE_STRING='yast2-trans-cs 2.17.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1280,7 +1280,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-trans-cs 2.17.6 to adapt to many kinds of systems. +\`configure' configures yast2-trans-cs 2.17.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1351,7 +1351,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-cs 2.17.6:";; + short | recursive ) echo "Configuration of yast2-trans-cs 2.17.7:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-cs configure 2.17.6 +yast2-trans-cs configure 2.17.7 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-trans-cs $as_me 2.17.6, which was +It was created by yast2-trans-cs $as_me 2.17.7, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2294,7 +2294,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-cs' - VERSION='2.17.6' + VERSION='2.17.7' cat >>confdefs.h <<_ACEOF @@ -2518,7 +2518,7 @@ -VERSION="2.17.6" +VERSION="2.17.7" RPMNAME="yast2-trans-cs" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3507,7 +3507,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-cs $as_me 2.17.6, which was +This file was extended by yast2-trans-cs $as_me 2.17.7, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3557,7 +3557,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-trans-cs config.status 2.17.6 +yast2-trans-cs config.status 2.17.7 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-cs-2.17.6/configure.in new/yast2-trans-cs-2.17.7/configure.in --- old/yast2-trans-cs-2.17.6/configure.in 2008-11-21 13:53:06.000000000 +0100 +++ new/yast2-trans-cs-2.17.7/configure.in 2008-11-28 16:06:58.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-cs, 2.17.6, http://bugs.opensuse.org/, yast2-trans-cs) +AC_INIT(yast2-trans-cs, 2.17.7, http://bugs.opensuse.org/, yast2-trans-cs) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.6" +VERSION="2.17.7" RPMNAME="yast2-trans-cs" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-cs-2.17.6/po/network.cs.po new/yast2-trans-cs-2.17.7/po/network.cs.po --- old/yast2-trans-cs-2.17.6/po/network.cs.po 2008-11-21 07:51:03.000000000 +0100 +++ new/yast2-trans-cs-2.17.7/po/network.cs.po 2008-11-28 16:05:16.000000000 +0100 @@ -1,17 +1,3 @@ -# translation of network.po to cs_CZ -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to -# translation of network.po to # translation of network.po to # Czech message file for YaST2 (network). # Copyright (C) 1999-2002 SuSE CR. @@ -26,14 +12,15 @@ # Jakub Friedl <jfried(a)suse.cz>, 2005. # Klára Cihlářová <koty(a)seznam.cz>, 2007. # Marek Stopka <marekstopka(a)gmail.com>, 2007, 2008. +# Marek Stopka <mstopka(a)opensuse.org>, 2008. msgid "" msgstr "" "Project-Id-Version: network\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-20 16:30+0100\n" -"PO-Revision-Date: 2008-05-23 15:28+0200\n" -"Last-Translator: Klara Cihlarova <koty(a)seznam.cz>\n" -"Language-Team: cs_CZ <cs(a)li.org>\n" +"PO-Revision-Date: 2008-11-26 14:25+0100\n" +"Last-Translator: Marek Stopka <mstopka(a)opensuse.org>\n" +"Language-Team: <cs(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -180,9 +167,8 @@ #. Commandline option help #: src/clients/lan.ycp:122 -#, fuzzy msgid "Prefix length" -msgstr "Délka klíče" +msgstr "Délka prefixu" #. Commandline option help #: src/clients/lan.ycp:127 @@ -191,15 +177,13 @@ #. Commandline option help #: src/clients/lan.ycp:132 -#, fuzzy msgid "Ethernet Device for VLAN" -msgstr "Skutečné rozhraní pro &VLAN" +msgstr "Ethernetové rozhraní pro VLAN" #. Commandline option help #: src/clients/lan.ycp:137 -#, fuzzy msgid "Interfaces for Bridging" -msgstr "Rozhraní" +msgstr "Rozhzraní pro přemostění" #: src/clients/lan_auto.ycp:321 msgid "Configuration Error : uninitialized interface!" @@ -474,56 +458,49 @@ #: src/clients/routing.ycp:240 #, ycp-format msgid "No entry for destination '%1' in routing table" -msgstr "" +msgstr "Žádný záznam pro cíl \"%1\" v routovací tabulce" #: src/clients/routing.ycp:127 -#, fuzzy msgid "IP Forwarding:" -msgstr "IP forwarding: zapnuto" +msgstr "IP forwarding:" #: src/clients/routing.ycp:133 -#, fuzzy msgid "IP forwarding is enabled" -msgstr "IP forwarding: zapnuto" +msgstr "IP forwarding je povolen" #: src/clients/routing.ycp:135 -#, fuzzy msgid "IP forwarding is disabled" -msgstr "Dálkové ovládání je zakázáno" +msgstr "IP forwarding je zakázán" #: src/clients/routing.ycp:141 -#, fuzzy msgid "Enabling IP forwarding..." -msgstr "Povolit &IP forwarding" +msgstr "Povoluji IP forwarding..." #: src/clients/routing.ycp:148 -#, fuzzy msgid "Disabling IP forwarding..." -msgstr "Povolit &IP forwarding" +msgstr "Zakazuji IP forwarding..." #: src/clients/routing.ycp:166 -#, fuzzy msgid "At least destination and gateway IP addresses must be specified" -msgstr "Musí být nastavena nejméně jedna adresa" +msgstr "" #: src/clients/routing.ycp:170 -#, fuzzy, ycp-format +#, ycp-format msgid "Adding '%1' destination to routing table ..." -msgstr "Přidávají se soubory do tabulky..." +msgstr "" #: src/clients/routing.ycp:183 -#, fuzzy msgid "Destination IP address must be specified" -msgstr "Musí být nastavena nejméně jedna adresa" +msgstr "Cílová IP adresa musí být zadána" #: src/clients/routing.ycp:187 msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified" -msgstr "" +msgstr "Musí být zadán alespoň jeden z těchto parametrů (brána, síťová maska, zařízení, volby)" #: src/clients/routing.ycp:205 -#, fuzzy, ycp-format +#, ycp-format msgid "Updating '%1' destination in routing table ..." -msgstr "Aktualizuje se překlad nabídky zavaděče..." +msgstr "" #: src/clients/routing.ycp:236 #, ycp-format @@ -536,71 +513,60 @@ msgstr "Konfigurace směrování" #: src/clients/routing.ycp:259 -#, fuzzy msgid "Show complete routing table" -msgstr "Zobrazit kompletní &seznam" +msgstr "Zobrazit celou routovací tabulku" #: src/clients/routing.ycp:263 msgid "Show routing table entry for selected destination" msgstr "" #: src/clients/routing.ycp:268 -#, fuzzy msgid "IP forwarding settings" -msgstr "Zapsat nastavení IP přeposílání" +msgstr "Nastavení IP forwardingu" #: src/clients/routing.ycp:276 -#, fuzzy msgid "Add new route" -msgstr "Přidat novou skupinu" +msgstr "" #: src/clients/routing.ycp:281 -#, fuzzy msgid "Edit an existing route" -msgstr "Upravit existující skupinu " +msgstr "" #: src/clients/routing.ycp:286 -#, fuzzy msgid "Delete an existing route" -msgstr "Smazat stávající skupinu" +msgstr "" #: src/clients/routing.ycp:294 -#, fuzzy msgid "Destination IP address" -msgstr "Cílová adresa IP." +msgstr "Cílová IP adresa" #: src/clients/routing.ycp:298 -#, fuzzy msgid "Gateway IP address" -msgstr "IP adresa brány je neplatná." +msgstr "IP adresy brány" #: src/clients/routing.ycp:302 -#, fuzzy msgid "Subnet mask" -msgstr "&Síťová maska podsítě" +msgstr "Maska podsítě" #: src/clients/routing.ycp:306 msgid "Network device" msgstr "Síťové zařízení" #: src/clients/routing.ycp:310 -#, fuzzy msgid "Additional options" -msgstr "D&alší ipppd volby" +msgstr "Další volby" #: src/clients/routing.ycp:313 msgid "Show current settings" msgstr "Zobrazit aktuální nastavení" #: src/clients/routing.ycp:316 -#, fuzzy msgid "Enable IP forwarding" -msgstr "Povolit &IP forwarding" +msgstr "Povolit IP forwarding" #: src/clients/routing.ycp:319 -#, fuzzy msgid "Disable IP forwarding" -msgstr "Povolit &IP forwarding" +msgstr "Zakázat IP forwarding" #. DSL read dialog help 1/2 #: src/dsl/complex.ycp:68 @@ -2112,9 +2078,8 @@ msgstr "Neplatná IP adresa." #: src/lan/address.ycp:435 -#, fuzzy msgid "No valid netmask or prefix lenght." -msgstr "Neplatná maska sítě." +msgstr "Nebyla zadána platná síťová maska, nebo délka prefixu." #: src/lan/address.ycp:442 msgid "No valid hostname." @@ -2176,9 +2141,8 @@ #. Combo Box label #: src/lan/address.ycp:522 -#, fuzzy msgid "Assign Interface to Firewall &Zone" -msgstr "Síťová rozhraní v zónách firewallu" +msgstr "Přidávám rozhraní do Zóny Firewallu" #. check box label #: src/lan/address.ycp:530 @@ -2202,9 +2166,8 @@ msgstr "Jméno &konfigurace" #: src/lan/address.ycp:573 -#, fuzzy msgid "Persistent Tunnel" -msgstr "Perzistentní s&uperblok" +msgstr "Trvalý tunel" #: src/lan/address.ycp:575 msgid "Tunnel owner" @@ -2245,19 +2208,16 @@ msgstr "Dynamická adresa" #: src/lan/address.ycp:637 -#, fuzzy msgid "DHCP both version 4 and 6" -msgstr "Verze a vydání produktu" +msgstr "DHCV verze 4 a 6" #: src/lan/address.ycp:638 -#, fuzzy msgid "DHCP version 4 only" -msgstr "LDAP verze 2" +msgstr "Pouze DHCP verze 4" #: src/lan/address.ycp:639 -#, fuzzy msgid "DHCP version 6 only" -msgstr "LDAP verze 2" +msgstr "Pouze DHCP verze 6" #. TODO : Stat ... Assigned #: src/lan/address.ycp:644 @@ -2358,13 +2318,12 @@ msgstr "Nastavení síťové karty" #: src/lan/bridge.ycp:65 -#, fuzzy msgid "" "At least one selected device is already configured.\n" "Remove the configuration?\n" msgstr "" -"Zdá se, že bylo již nastaveno alespoň jedno zařízení.\n" -"Pokračovat v konfiguraci?\n" +"Alespoň jedno z vybraných zařízení již bylo nastaveno.\n" +"Přejete si odstranit konfiguraci?\n" #. Network card name (wireless) #: src/lan/cards.ycp:39 @@ -2558,9 +2517,8 @@ msgstr "Špatná hodnota startmode!" #: src/lan/cmdline.ycp:163 -#, fuzzy msgid "For static configuration \"ip\" option is needed!" -msgstr "Automatická konfigurace přeskočena (%1)" +msgstr "Pro statickou konfiguraci \"ip\" je tato volba nezbytná!" #: src/lan/cmdline.ycp:197 msgid "The device was deleted." @@ -2613,9 +2571,8 @@ msgstr "Instaluje se firmware..." #: src/lan/complex.ycp:161 -#, fuzzy msgid "For successful firmware installation the, 'install_bcm43xx_firmware' script needs to be executed. Execute it now ?" -msgstr "Pro úspěšnou instalaci firmwaru musí být spuštěn skript 'install_bcm43xx_firmware'. Spustit?" +msgstr "Pro úspěšnou instalaci firmwaru musí být spuštěn skript 'install_bcm43xx_firmware'. Přejete si jej nyní spustit?" #: src/lan/complex.ycp:167 msgid "An error occurred during firmware installation." @@ -2730,7 +2687,6 @@ #. Manual network card setup help 2/4 #. translators: do not translated udev, MAC, BusID #: src/lan/hardware.ycp:35 -#, fuzzy msgid "" "Udev Rules are rules for the Kernel device manager that allow\n" "associating MAC address or BusID of the network device with its name (for example,\n" @@ -7190,132 +7146,3 @@ #: src/services/routing.ycp:348 msgid "Routing" msgstr "Směrování" - -#~ msgid "" -#~ "NetworkManager is enabled. Some features, such as\n" -#~ "multiple providers for one modem, will not work.\n" -#~ "You may want to use kinternet instead." -#~ msgstr "" -#~ "NetworkManager je povolen. Některé funkce, např.\n" -#~ "více poskytovatelů pro jeden, nebudou fungovat.\n" -#~ "Pokud tyto funkce potřebujete, použijte místo NetworkManageru\n" -#~ "KInternet." - -#~ msgid "Run KInternet" -#~ msgstr "Spustit KInternet" - -#~ msgid "Running KInternet..." -#~ msgstr "Spouští se KInternet..." - -#, fuzzy -#~ msgid "The %1 packages must be installed because device control for non-root users has been established." -#~ msgstr "Aby zařízení mohlo být ovládáno uživateli, je nutné nainstalovat balíček %1." - -#~ msgid "Do you want to install it now?" -#~ msgstr "Přejete si jej nyní nainstalovat?" - -#, fuzzy -#~ msgid "" -#~ "Download of latest release notes failed due to server-side error. \n" -#~ "This does not necessarily mean misconfigured network.\n" -#~ "\n" -#~ "Click Continue to proceed to the next installation step. To skip any steps\n" -#~ "requiring internet connection or to get back to your network configuration,\n" -#~ "click Cancel." -#~ msgstr "" -#~ "Stahování posledních poznámek k vydání selhalo, kvůli chybě serveru.\n" -#~ "Toto nemusí nutně znamenat, že je síť nastavena špatně.\n" -#~ "\n" -#~ "Stiskněte 'Pokračovat' pro provedení následujících kroků instalace. Pro přeskočení všech kroků vyžadujících připojení k internetu, nebo návrat ke konfigurací sítě stiskněte 'Přerušit'." - -#, fuzzy -#~ msgid "Destination addresss IP" -#~ msgstr "Cílová adresa IP." - -#~ msgid "Propose a configuration" -#~ msgstr "Navrhnout konfiguraci" - -#~ msgid "Routing Configuration Summary:" -#~ msgstr "Shrnutí konfigurace směrování:" - -#~ msgid "" -#~ "If you plan to use a dial-up Internet connection and have set up your\n" -#~ "connection to use dynamic DNS assignment, these values will be temporarily\n" -#~ "disabled during the connection." -#~ msgstr "" -#~ "Pokud plánujete vytáčené připojení k Internetu (např. modemem)\n" -#~ "a použili jste dynamické přiřazení DNS, tyto hodnoty budou dočasně\n" -#~ "nepřístupné během vašeho připojení." - -#~ msgid "Optionally enter the name server list and domain search list." -#~ msgstr "Volitelně zadejte nameservery a seznam prohledávaných domén." - -#~ msgid "" -#~ "Note that the hostname is global--it applies to all\n" -#~ "interfaces, not just this one." -#~ msgstr "" -#~ "Pamatujte, že jméno počítače je globální - platí pro\n" -#~ "všechna rozhraní, nikoliv pouze toto." - -#~ msgid "" -#~ "The resolver configuration file (/etc/resolv.conf)\n" -#~ "has been temporarily modified by %1. You have two options:" -#~ msgstr "" -#~ "Konfigurační soubor resolveru (/etc/resolv.conf)\n" -#~ "byl dočasně změněn programem %1. Máte dvě možnosti:" - -#~ msgid "" -#~ "Modify the current version of the file.\n" -#~ "Press Accept and continue editing other data. You are able to return to this dialog at a later time, \n" -#~ "when the above service has terminated.\n" -#~ msgstr "" -#~ "Modifikovat současnou (změněnou) verzi souboru\n" -#~ "Stisknout 'Přijmout' a pokračovat k úpravách jiných dat, \n" -#~ "netýkajících se resolveru. Můžete se později k tomuto dialogu\n" -#~ "vrátit v momentě, kdy je služba ukončena.\n" - -#~ msgid "Name Servers: Set by DHCP" -#~ msgstr "Nameservery: nastavuje DHCP" - -#~ msgid "Search List: Set by DHCP" -#~ msgstr "Seznam hledání: nastavuje DHCP" - -#~ msgid "Enter the name for this computer and the DNS domain that it belongs to." -#~ msgstr "Zadejte jméno počítače a DNS doménu, do které náleží." - -#~ msgid "The domain is especially important if this computer is a mail server." -#~ msgstr "Doména je důležití zvláště pokud počítač slouží jako poštovní server." - -#~ msgid "&Change /etc/resolv.conf manually" -#~ msgstr "&Změnit /etc/resolv.conf ručně" - -#~ msgid "&Update DNS data via DHCP" -#~ msgstr "Akt&ualizovat DNS data pomocí DHCP" - -#~ msgid "Device type" -#~ msgstr "Typ zařízení" - -#~ msgid "Impossible value for type!" -#~ msgstr "Špatná hodnota pro typ!" - -#~ msgid "Device Type" -#~ msgstr "Typ zařízení" - -#~ msgid "Bootproto" -#~ msgstr "Bootproto" - -#~ msgid "Mask" -#~ msgstr "Maska" - -#~ msgid "Updating <tt>/etc/resolv.conf</tt>..." -#~ msgstr "Aktualizuje se <tt>/etc/resolv.conf</tt>..." - -#~ msgid "Updating <tt>/etc/hosts</tt>..." -#~ msgstr "Aktualizuje se <tt>/etc/hosts</tt>..." - -#~ msgid "" -#~ "Press Manually tocontrol the interface manually\n" -#~ "via ifup or KInternet (See User Controlled below).\n" -#~ msgstr "" -#~ "Ruční: Rozhraní ovládáte ručně\n" -#~ "pomocí 'ifup' nebo 'kinternet' (viz 'Ovládané uživatelem' níže).\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-cs-2.17.6/po/squid.cs.po new/yast2-trans-cs-2.17.7/po/squid.cs.po --- old/yast2-trans-cs-2.17.6/po/squid.cs.po 2008-11-21 07:51:42.000000000 +0100 +++ new/yast2-trans-cs-2.17.7/po/squid.cs.po 2008-11-28 16:05:54.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: squid.cs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-20 16:47+0100\n" +"POT-Creation-Date: 2008-11-26 13:32+0100\n" "PO-Revision-Date: 2008-05-26 23:22+0200\n" "Last-Translator: Jakub Hegenbart <jakub.hegenbart(a)gmail.com>\n" "Language-Team: Czech <cs(a)li.org>\n" @@ -256,6 +256,34 @@ msgid "Days" msgstr "Dní" +#: src/SquidACL.ycp:145 +msgid "Monday" +msgstr "Pondělí" + +#: src/SquidACL.ycp:146 +msgid "Tuesday" +msgstr "Úterý" + +#: src/SquidACL.ycp:147 +msgid "Wednesday" +msgstr "Středa" + +#: src/SquidACL.ycp:148 +msgid "Thursday" +msgstr "Čtvrtek" + +#: src/SquidACL.ycp:149 +msgid "Friday" +msgstr "Pátek" + +#: src/SquidACL.ycp:150 +msgid "Saturday" +msgstr "Sobota" + +#: src/SquidACL.ycp:151 +msgid "Sunday" +msgstr "Neděle" + #: src/SquidACL.ycp:153 msgid "From (H:M)" msgstr "Od (H:M)" @@ -685,6 +713,26 @@ msgid "&Units" msgstr "Jedn&otky" +#: src/helper_functions.ycp:60 +#, fuzzy +msgid "seconds" +msgstr "s" + +#: src/helper_functions.ycp:61 +#, fuzzy +msgid "minutes" +msgstr "5 minut" + +#: src/helper_functions.ycp:62 +#, fuzzy +msgid "hours" +msgstr "h" + +#: src/helper_functions.ycp:63 +#, fuzzy +msgid "days" +msgstr " dní" + #. Read dialog help 1/2 #: src/helps.ycp:38 msgid "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-cs-2.17.6/po/status.txt new/yast2-trans-cs-2.17.7/po/status.txt --- old/yast2-trans-cs-2.17.6/po/status.txt 2008-11-21 07:52:05.000000000 +0100 +++ new/yast2-trans-cs-2.17.7/po/status.txt 2008-11-28 16:06:14.000000000 +0100 @@ -1,6 +1,6 @@ -Translated : 17695 -Fuzzy : 1661 -Untranslated : 587 +Translated : 17731 +Fuzzy : 1632 +Untranslated : 596 -------------------- - All strings : 19943 + All strings : 19959 89 % are translated diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-cs-2.17.6/po/yast2-gtk.cs.po new/yast2-trans-cs-2.17.7/po/yast2-gtk.cs.po --- old/yast2-trans-cs-2.17.6/po/yast2-gtk.cs.po 2008-11-21 07:52:04.000000000 +0100 +++ new/yast2-trans-cs-2.17.7/po/yast2-gtk.cs.po 2008-11-28 16:06:13.000000000 +0100 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: yast2-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-20 16:31+0100\n" +"POT-Creation-Date: 2008-11-21 12:10+0000\n" "PO-Revision-Date: 2008-05-26 16:38+0200\n" "Last-Translator: Vojtěch Zeisek <vojta.sc(a)seznam.cz>\n" "Language-Team: czech <cs(a)li.org>\n" @@ -23,19 +23,19 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: KBabel 1.11.4\n" -#: 10_3/src/YGPackageSelector.cc:288 src/YGPackageSelector.cc:799 +#: 10_3/src/YGPackageSelector.cc:288 src/YGPackageSelector.cc:801 msgid "Undo" msgstr "Zpět" -#: 10_3/src/YGPackageSelector.cc:356 src/YGPackageSelector.cc:863 +#: 10_3/src/YGPackageSelector.cc:356 src/YGPackageSelector.cc:865 msgid "Changes:" msgstr "Změny:" -#: 10_3/src/YGPackageSelector.cc:590 src/YGPackageSelector.cc:1057 +#: 10_3/src/YGPackageSelector.cc:590 src/YGPackageSelector.cc:1059 msgid "All" msgstr "Vše" -#: 10_3/src/YGPackageSelector.cc:656 src/YGPackageSelector.cc:1313 +#: 10_3/src/YGPackageSelector.cc:656 src/YGPackageSelector.cc:1315 msgid "Install All" msgstr "Instalovat vše" @@ -71,18 +71,18 @@ msgid "Categories" msgstr "Kategorie" -#: 10_3/src/YGPackageSelector.cc:878 src/YGPackageSelector.cc:1555 +#: 10_3/src/YGPackageSelector.cc:878 src/YGPackageSelector.cc:1557 msgid "Patterns" msgstr "Vzory" -#: 10_3/src/YGPackageSelector.cc:879 src/YGPackageSelector.cc:1556 +#: 10_3/src/YGPackageSelector.cc:879 src/YGPackageSelector.cc:1558 msgid "Languages" msgstr "Jazyky" #. available #. installed #: 10_3/src/YGPackageSelector.cc:1003 src/YGPackageSelector.cc:389 -#: src/YGPackageSelector.cc:1776 +#: src/YGPackageSelector.cc:1777 msgid "_Remove" msgstr "_Odstranit" @@ -90,8 +90,8 @@ msgid "Package lock: prevents the package status from being modified by the solver (that is, it won't honour dependencies or collections ties.)" msgstr "Zamknutí balíčků: předchází změně statutu balíčku řešitelem (takže nebude respektovat závislosti nebo závazky sad balíčků)." -#: 10_3/src/YGPackageSelector.cc:1046 src/yzyppwrapper.cc:423 -#: src/yzyppwrapper.cc:515 src/yzyppwrapper.cc:1124 src/yzyppwrapper.cc:1134 +#: 10_3/src/YGPackageSelector.cc:1046 src/yzyppwrapper.cc:455 +#: src/yzyppwrapper.cc:559 src/yzyppwrapper.cc:1170 src/yzyppwrapper.cc:1180 msgid "Installed: " msgstr "Nainstalováno:" @@ -124,7 +124,7 @@ msgid "Description" msgstr "Popis" -#: 10_3/src/YGPackageSelector.cc:1306 src/YGPackageSelector.cc:2148 +#: 10_3/src/YGPackageSelector.cc:1306 src/YGPackageSelector.cc:2154 msgid "File List" msgstr "Seznam souborů" @@ -132,7 +132,7 @@ msgid "ChangeLog" msgstr "Záznam o změnách" -#: 10_3/src/YGPackageSelector.cc:1308 src/YGPackageSelector.cc:2150 +#: 10_3/src/YGPackageSelector.cc:1308 src/YGPackageSelector.cc:2156 msgid "Authors" msgstr "Autoři" @@ -140,15 +140,15 @@ msgid "(only available for installed packages)" msgstr "(dostupné pouze pro nainstalované balíčky)" -#: 10_3/src/YGPackageSelector.cc:1443 src/YGPackageSelector.cc:2508 +#: 10_3/src/YGPackageSelector.cc:1443 src/YGPackageSelector.cc:2534 msgid "Disk Almost Full !" msgstr "Disk se skoro plný!" -#: 10_3/src/YGPackageSelector.cc:1465 src/YGPackageSelector.cc:2387 +#: 10_3/src/YGPackageSelector.cc:1465 src/YGPackageSelector.cc:2413 msgid "Mount Point" msgstr "Bod připojení" -#: 10_3/src/YGPackageSelector.cc:1468 src/YGPackageSelector.cc:2390 +#: 10_3/src/YGPackageSelector.cc:1468 src/YGPackageSelector.cc:2416 msgid "Usage" msgstr "Použití" @@ -164,7 +164,7 @@ msgid "Package Selector" msgstr "Vývěr balíčků" -#: 10_3/src/YGPackageSelector.cc:1627 src/YGPackageSelector.cc:2655 +#: 10_3/src/YGPackageSelector.cc:1627 src/YGPackageSelector.cc:2681 msgid "_Cancel" msgstr "_Zrušit" @@ -172,11 +172,11 @@ msgid "_Apply" msgstr "_Aplikovat" -#: 10_3/src/YGPackageSelector.cc:1674 src/YGPackageSelector.cc:2720 +#: 10_3/src/YGPackageSelector.cc:1674 src/YGPackageSelector.cc:2746 msgid "Changes not saved!" msgstr "Změny nejsou uloženy!" -#: 10_3/src/YGPackageSelector.cc:1676 src/YGPackageSelector.cc:2722 +#: 10_3/src/YGPackageSelector.cc:1676 src/YGPackageSelector.cc:2748 msgid "Quit anyway?" msgstr "Stejně opustit?" @@ -192,7 +192,7 @@ msgid "_Accept" msgstr "_Přijmout" -#: 10_3/src/YGPackageSelector.cc:1830 src/YGPackageSelector.cc:2905 +#: 10_3/src/YGPackageSelector.cc:1830 src/YGPackageSelector.cc:2931 msgid "There are some conflicts on the transaction that must be solved manually." msgstr "Doško ke konfliktu v transakci, který musí být vyřešen ručně." @@ -208,11 +208,11 @@ msgid "Size: " msgstr "Velikost: " -#: 10_3/src/yzyppwrapper.cc:399 src/yzyppwrapper.cc:672 +#: 10_3/src/yzyppwrapper.cc:399 src/yzyppwrapper.cc:716 msgid "Packaged by:" msgstr "Zabalil: " -#: 10_3/src/yzyppwrapper.cc:401 src/yzyppwrapper.cc:670 +#: 10_3/src/yzyppwrapper.cc:401 src/yzyppwrapper.cc:714 msgid "Developed by:" msgstr "Vývoj:" @@ -236,42 +236,42 @@ msgid "_Lock" msgstr "_Zamknout" -#: src/YGPackageSelector.cc:560 +#: src/YGPackageSelector.cc:562 msgid "To re-install a different version" msgstr "" -#: src/YGPackageSelector.cc:562 +#: src/YGPackageSelector.cc:564 #, fuzzy msgid "To install" msgstr "Nainstalovat:" -#: src/YGPackageSelector.cc:565 +#: src/YGPackageSelector.cc:567 #, fuzzy msgid "To remove" msgstr "Odstranit:" -#: src/YGPackageSelector.cc:567 +#: src/YGPackageSelector.cc:569 msgid "Installed" msgstr "Nainstalováno" -#: src/YGPackageSelector.cc:569 +#: src/YGPackageSelector.cc:571 #, fuzzy msgid " (upgrade available)" msgstr "žádný dostupný balíček" # -#: src/YGPackageSelector.cc:572 +#: src/YGPackageSelector.cc:574 #, fuzzy msgid "Not installed" msgstr "Nenainstalováno (%1)" -#: src/YGPackageSelector.cc:574 +#: src/YGPackageSelector.cc:576 msgid "" "\n" "status changed by the dependency solver" msgstr "" -#: src/YGPackageSelector.cc:576 +#: src/YGPackageSelector.cc:578 msgid "" "\n" "locked: right-click to unlock" @@ -286,88 +286,88 @@ msgid "View as grid" msgstr "" -#: src/YGPackageSelector.cc:818 +#: src/YGPackageSelector.cc:820 #, fuzzy msgid "upgrade" msgstr "_upgrade" -#: src/YGPackageSelector.cc:820 +#: src/YGPackageSelector.cc:822 #, fuzzy msgid "downgrade" msgstr "_downgrade" -#: src/YGPackageSelector.cc:822 +#: src/YGPackageSelector.cc:824 #, fuzzy msgid "re-install" msgstr "Přeinstalovat" -#: src/YGPackageSelector.cc:825 +#: src/YGPackageSelector.cc:827 msgid "patch" msgstr "aktualizace" -#: src/YGPackageSelector.cc:827 +#: src/YGPackageSelector.cc:829 #, fuzzy msgid "install" msgstr "Instalovat" -#: src/YGPackageSelector.cc:830 +#: src/YGPackageSelector.cc:832 #, fuzzy msgid "remove" msgstr "_odstranit" -#: src/YGPackageSelector.cc:841 +#: src/YGPackageSelector.cc:843 msgid "" "\n" "from" msgstr "" -#: src/YGPackageSelector.cc:1141 +#: src/YGPackageSelector.cc:1143 #, fuzzy msgid "Detailed" msgstr "Detail" -#: src/YGPackageSelector.cc:1145 +#: src/YGPackageSelector.cc:1147 msgid "Group by the PackageKit-based filter or straight from the actual RPM information." msgstr "" -#: src/YGPackageSelector.cc:1187 src/yzyppwrapper.cc:1996 +#: src/YGPackageSelector.cc:1189 src/yzyppwrapper.cc:2048 msgid "Recommended" msgstr "Doporučené" -#: src/YGPackageSelector.cc:1191 +#: src/YGPackageSelector.cc:1193 msgid "Suggested" msgstr "Navrhované" -#: src/YGPackageSelector.cc:1232 +#: src/YGPackageSelector.cc:1234 msgid "Edit..." msgstr "Upravit..." -#: src/YGPackageSelector.cc:1239 +#: src/YGPackageSelector.cc:1241 #, fuzzy msgid "Access the repositories manager tool." msgstr "Inicializovat správce repozitářů" -#: src/YGPackageSelector.cc:1440 +#: src/YGPackageSelector.cc:1442 #, fuzzy msgid "_Available" msgstr "Dostupné" -#: src/YGPackageSelector.cc:1444 +#: src/YGPackageSelector.cc:1446 #, fuzzy msgid "_Upgrades" msgstr "_Upgrade" -#: src/YGPackageSelector.cc:1447 +#: src/YGPackageSelector.cc:1449 #, fuzzy msgid "_Installed" msgstr "Nainstalováno" -#: src/YGPackageSelector.cc:1449 +#: src/YGPackageSelector.cc:1451 #, fuzzy msgid "A_ll" msgstr "Vše" -#: src/YGPackageSelector.cc:1531 +#: src/YGPackageSelector.cc:1533 #, fuzzy msgid "" "Package search: Use spaces to separate your keywords. They will be matched against RPM name and summary attributes. Other criteria attributes are available by pressing the search icon.\n" @@ -376,45 +376,45 @@ "Hledání balíčků: Použijte mezery na oddělení vašich klíčových slov. Budou porovnány s RPM atributy jméno, souhrn a poskytuje.\n" "(např. \"yast dhcp\" vrátí nástroj nastavení dhcpd z YaSTu)" -#: src/YGPackageSelector.cc:1535 +#: src/YGPackageSelector.cc:1537 #, fuzzy msgid "Filter by name & summary" msgstr "Filtrovat podle data" -#: src/YGPackageSelector.cc:1537 +#: src/YGPackageSelector.cc:1539 #, fuzzy msgid "Filter by description" msgstr "Popis &tiskárny" -#: src/YGPackageSelector.cc:1539 +#: src/YGPackageSelector.cc:1541 #, fuzzy msgid "Filter by file" msgstr "Filtrovat podle data" -#: src/YGPackageSelector.cc:1541 +#: src/YGPackageSelector.cc:1543 #, fuzzy msgid "Filter by author" msgstr "Filtrovat podle data" -#: src/YGPackageSelector.cc:1543 +#: src/YGPackageSelector.cc:1545 #, fuzzy msgid "Filter by novelty (in days)" msgstr "Filtrovat podle data" -#: src/YGPackageSelector.cc:1544 +#: src/YGPackageSelector.cc:1546 #, fuzzy msgid "Number of days since the package was built by the repository." msgstr "Nelze uložit změny do repozitáře.\n" -#: src/YGPackageSelector.cc:1552 +#: src/YGPackageSelector.cc:1554 msgid "Severity" msgstr "Závažnost" -#: src/YGPackageSelector.cc:1554 +#: src/YGPackageSelector.cc:1556 msgid "Groups" msgstr "Skupiny" -#: src/YGPackageSelector.cc:1558 +#: src/YGPackageSelector.cc:1560 msgid "" "Packages can be organized in:\n" "Groups: simple categorization of packages by purpose.\n" @@ -423,175 +423,179 @@ "Repositories: catalogues what the several configured repositories have available." msgstr "" -#: src/YGPackageSelector.cc:1566 +#: src/YGPackageSelector.cc:1568 msgid "Repositories" msgstr "Repozitáře" -#: src/YGPackageSelector.cc:1694 +#: src/YGPackageSelector.cc:1696 msgid "" "Patterns are available that can\n" "assist you in the installment\n" "of" msgstr "" -#: src/YGPackageSelector.cc:1697 +#: src/YGPackageSelector.cc:1699 #, fuzzy msgid "related packages." msgstr "Navržené balíky" -#: src/YGPackageSelector.cc:1706 +#: src/YGPackageSelector.cc:1708 #, fuzzy msgid "" "The file filter is only\n" "applicable to installed packages." msgstr "Informace dostupné pouze pro nainstalované balíčky." -#: src/YGPackageSelector.cc:1786 +#: src/YGPackageSelector.cc:1787 src/yzyppwrapper.cc:470 msgid "Installed:" msgstr "Nainstalováno:" -#: src/YGPackageSelector.cc:1810 +#: src/YGPackageSelector.cc:1811 msgid "Available:" msgstr "Dostupné:" -#: src/YGPackageSelector.cc:2001 +#: src/YGPackageSelector.cc:2006 #, fuzzy msgid "Ins_tall" msgstr "Instalovat" -#: src/YGPackageSelector.cc:2004 +#: src/YGPackageSelector.cc:2009 #, fuzzy msgid "Up_grade" msgstr "Aktualizace" -#: src/YGPackageSelector.cc:2006 +#: src/YGPackageSelector.cc:2011 #, fuzzy msgid "Re-ins_tall" msgstr "Přeinstalovat" #. if (version->cmp < 0) -#: src/YGPackageSelector.cc:2008 +#: src/YGPackageSelector.cc:2013 #, fuzzy msgid "Down_grade" msgstr "Downgrade" -#: src/YGPackageSelector.cc:2101 +#: src/YGPackageSelector.cc:2105 msgid "Requires:" msgstr "Vyžaduje:" -#: src/YGPackageSelector.cc:2102 +#: src/YGPackageSelector.cc:2106 msgid "Provides:" msgstr "Poskytuje:" -#: src/YGPackageSelector.cc:2149 +#: src/YGPackageSelector.cc:2155 msgid "Changelog" msgstr "Záznam o změnách" -#: src/YGPackageSelector.cc:2151 +#: src/YGPackageSelector.cc:2157 msgid "Support" msgstr "Podpora" -#: src/YGPackageSelector.cc:2152 +#: src/YGPackageSelector.cc:2158 msgid "Dependencies" msgstr "Závislosti" -#: src/YGPackageSelector.cc:2236 +#: src/YGPackageSelector.cc:2173 +msgid "Applies to" +msgstr "" + +#: src/YGPackageSelector.cc:2262 #, c-format msgid "Package '%s' was not found." msgstr "Balíček '%s' nebyl nalezen." -#: src/YGPackageSelector.cc:2447 +#: src/YGPackageSelector.cc:2473 msgid "Disk usage" msgstr "Zaplnění disku" -#: src/YGPackageSelector.cc:2482 src/yzyppwrapper.cc:423 -#: src/yzyppwrapper.cc:515 src/yzyppwrapper.cc:1124 src/yzyppwrapper.cc:1134 +#: src/YGPackageSelector.cc:2508 src/yzyppwrapper.cc:455 +#: src/yzyppwrapper.cc:559 src/yzyppwrapper.cc:1170 src/yzyppwrapper.cc:1180 msgid " of " msgstr " z " -#: src/YGPackageSelector.cc:2510 +#: src/YGPackageSelector.cc:2536 msgid "One of the partitions is reaching its limit of capacity. You may have to remove packages if you wish to install some." msgstr "Jeden z oddílů se přibližuje k limitu své kapacity. Pokud chcete nainstalovat balíčky, můžete jiné odebrat." -#: src/YGPackageSelector.cc:2556 +#: src/YGPackageSelector.cc:2582 #, fuzzy msgid "Packages _listing:" msgstr "Výběr balíčků" -#: src/YGPackageSelector.cc:2650 +#: src/YGPackageSelector.cc:2676 msgid "Online Update" msgstr "Online aktualizace" -#: src/YGPackageSelector.cc:2650 +#: src/YGPackageSelector.cc:2676 #, fuzzy msgid "Software Manager" msgstr "Software" -#: src/YGPackageSelector.cc:2653 +#: src/YGPackageSelector.cc:2679 msgid "Please wait..." msgstr "Čekejte prosím..." -#: src/YGPackageSelector.cc:2658 +#: src/YGPackageSelector.cc:2684 #, fuzzy msgid "A_pply" msgstr "_Aplikovat" -#: src/YGPackageSelector.cc:2750 +#: src/YGPackageSelector.cc:2776 #, fuzzy msgid "Unsupported Packages" msgstr "Nainstalované balíčky" -#: src/YGPackageSelector.cc:2752 +#: src/YGPackageSelector.cc:2778 msgid "Please realize that the following software is either unsupported or requires an additional customer contract for support." msgstr "" -#: src/YGPackageSelector.cc:2808 +#: src/YGPackageSelector.cc:2834 msgid "License Agreement" msgstr "Licenční ujednání" -#: src/YGPackageSelector.cc:2809 +#: src/YGPackageSelector.cc:2835 msgid "Do you accept the terms of this license?" msgstr "Souhlasíte s těmito licenčními podmínkami?" -#: src/YGPackageSelector.cc:2814 +#: src/YGPackageSelector.cc:2840 #, fuzzy msgid "Notification" msgstr "Stručné oznamování" -#: src/YGPackageSelector.cc:2969 +#: src/YGPackageSelector.cc:2995 msgid "Dependencies from Filtered Repositories" msgstr "Závislosti nalezených repozitářů" -#: src/YGPackageSelector.cc:2971 +#: src/YGPackageSelector.cc:2997 #, fuzzy msgid "The following packages have necessary dependencies that are not provided by the filtered repository. Install them?" msgstr "Pro splnění jsou nutné následující balíčky, které nejsou součástí nalezeného repozitáře. Nainstalovat?" -#: src/YGPackageSelector.cc:3024 +#: src/YGPackageSelector.cc:3050 msgid "Import Package List" msgstr "Importovat seznam balíčků" -#: src/YGPackageSelector.cc:3034 +#: src/YGPackageSelector.cc:3060 msgid "Couldn't load package list from: " msgstr "Nemůžu načíst seznam balíčků z:" -#: src/YGPackageSelector.cc:3036 +#: src/YGPackageSelector.cc:3062 msgid "Import Failed" msgstr "Import selhal" -#: src/YGPackageSelector.cc:3045 +#: src/YGPackageSelector.cc:3071 msgid "Export Package List" msgstr "Exportovat seznam balíčků" -#: src/YGPackageSelector.cc:3055 +#: src/YGPackageSelector.cc:3081 msgid "Couldn't save package list to: " msgstr "Nemůžu uložit seznam balíčků do:" -#: src/YGPackageSelector.cc:3057 +#: src/YGPackageSelector.cc:3083 msgid "Export Failed" msgstr "Export selhal" -#: src/YGPackageSelector.cc:3066 +#: src/YGPackageSelector.cc:3092 msgid "" "Use this to generate extensive logs to help tracking down bugs in the dependency resolver.\n" "The logs will be stored in directory: " @@ -599,23 +603,23 @@ "Toto použijte abyste vytvořili rozsáhlé záznamy, aby vám pomohly sledovat chyby v řešiteli závislostí.\n" "Záznamy budou skladovány v adresáři:" -#: src/YGPackageSelector.cc:3073 +#: src/YGPackageSelector.cc:3099 msgid "Create Dependency Resolver Test Case" msgstr "Vytvořit test řešení závislostí" -#: src/YGPackageSelector.cc:3083 +#: src/YGPackageSelector.cc:3109 msgid "Success" msgstr "Úspěch" -#: src/YGPackageSelector.cc:3084 +#: src/YGPackageSelector.cc:3110 msgid "Dependency resolver test case written to" msgstr "Testovací případ řešitele závislostí zapsán do" -#: src/YGPackageSelector.cc:3088 +#: src/YGPackageSelector.cc:3114 msgid "Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?" msgstr "Připravit <tt>y2logs.tgz</tt> balík pro přiložení do Bugzilly?" -#: src/YGPackageSelector.cc:3097 +#: src/YGPackageSelector.cc:3123 msgid "" "Failed to create dependency resolver test case.\n" "Please check disk space and permissions for" @@ -623,19 +627,19 @@ "Selhalo vytvoření testovacího případu.\n" "Prosíme, zkontrolujte místo na disku a povolení pro" -#: src/YGPackageSelector.cc:3109 +#: src/YGPackageSelector.cc:3135 msgid "Tools" msgstr "Nástroje" -#: src/YGPackageSelector.cc:3112 +#: src/YGPackageSelector.cc:3138 msgid "Import List..." msgstr "Importovat seznam..." -#: src/YGPackageSelector.cc:3116 +#: src/YGPackageSelector.cc:3142 msgid "Export List..." msgstr "Exportovat seznam..." -#: src/YGPackageSelector.cc:3121 +#: src/YGPackageSelector.cc:3147 msgid "Generate Dependency Testcase..." msgstr "Vytváření testovacího případu závislostí..." @@ -657,6 +661,14 @@ msgid "Couldn't save screenshot to file " msgstr "Nemůžu uložit seznam balíčků do:" +#: src/pkg-selector-help.h:6 +msgid "<h1>Purpose</h1>This tool lets you install, remove, and update applications.openSUSE's software management is also called 'package management'. A package is generally an application bundle, but multiple packages that extend the application may be offered in order to avoid clutter (e.g. games tend to de-couple the music data in another package, since its not essential and requires significant disk space). The base package will get the application's name, while extra packages are suffix-ed. Common extras are:<ul><li>-plugin-: extends the application with some extra functionality.</li><li>-devel: needed for software development.</li><li>-debuginfo: needed for software beta-testing.</li><li>-fr, -dr, -pl (language siglas): translation files (your language package will be marked for installation automatically).</li></ul>You will find both packages installed on your system, and packages that are made available through the setup-ed repositories. You cans either install or upgrade an available package, or remove an installed one.<blockquote>A repository is a packages media; it can either be local (like your Suse CDs), or a remote internet server. You can find utilities to setup repositories on the YaST control center.</blockquote><h1>Usage</h1><h2>Available, Upgrades, Installed buttons</h2>These buttons produce listings of the different sources of packages. 'Available' are the ones from the setup-ed repositories less those you have installed. 'Installed' lists the packages installed in your system. 'Upgrades' is a mix listing of the installed packages that have more recent versions available. 'All' will combine all sources.<h2>Filters</h2>Enter free text into the search-field to match their names and descriptions. (a search for 'office' will bring up the 'OpenOffice' packages as well as AbiWord which carries the word 'office' in its description). You can also choose to view software from a specific repository.<h2>Categories & Collections</h2>Software for openSUSE is indexed so that you can find software for a specific task when you don't know the name of the software you are looking for. Browse indices of software by using the tree-view in the left column; you can view the available software by their Package names, or grouped in 'Categories' or 'Patterns' by the selecting a view-mode from the drop-down-menu below. Categories' are simple, hierarchical classifications of software packages, like 'Multimedia/Video', while 'Patterns' are task-oriented collections of multiple packages that install like one (the installation of the 'server'-pattern for example will install various software needed for running a server). By using 'Install All' you make sure that future collection changes, when you upgrade openSUSE, will be honored.<h2>Software details in the box below</h2>In the package detail view you can perform actions affecting this software; like install, uninstall, version-upgrade or -downgrade. All changes that you make will be saved, but not yet performed.You can review changes in the right-side pane of the software-manager. You can revoke changes individually at any time by clicking the 'undo'-button next to a saved change.The lock button can be used to lock the selected package state; it won't allow some automatic operation to install, upgrade or remove the package. This is only useful in very unusual cases: for instance, you may not want to install some drivers because they interfer with your system, yet you want to install some collection that includes them.The changes will be performed once you decide to click the 'perform changes' button in the lower-right corner. If you want to leave the software-manager without performing any changes, simply press the button labeled 'Abort'.<blockquote>Developed by Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> Thanks to Christian Jager for co-designing this tool.</blockquote>" +msgstr "" + +#: src/pkg-selector-help.h:74 +msgid "<h1>Purpose</h1>This tool gives you control on overviewing and picking patches. You may also reverse patches that have been applied to the system.<h1>Usage</h1><h2>Categories</h2>Patches are grouped as follows:<ul><li>Security: patches a software flaw that could be exploited to gain restricted privilege.</li><li>Recommended: fixes non-security related flaws (e.g. data corruption, performance slowdown)</li><li>Optional: ones that only apply to few users.</li></ul>Only patches that apply to your system will be visible. openSUSE developers are very restrained in pushing patches; you can be sure that all patches are of signficant severity.If you are looking for applications enhancements, you should check for Upgrades on the Software Manager." +msgstr "" + #: src/ygtksteps.c:66 #, fuzzy msgid "Current step" @@ -765,7 +777,7 @@ msgid "Virtualization" msgstr "Virtualizace" -#: src/yzypptags.cc:49 src/yzyppwrapper.cc:1994 +#: src/yzypptags.cc:49 src/yzyppwrapper.cc:2046 msgid "Security" msgstr "Bezpečnost" @@ -796,49 +808,57 @@ msgid "Unknown Group" msgstr "Neznámá skupina" -#: src/yzyppwrapper.cc:463 +#: src/yzyppwrapper.cc:473 +msgid "Candidate:" +msgstr "" + +#: src/yzyppwrapper.cc:474 +msgid "from" +msgstr "" + +#: src/yzyppwrapper.cc:507 #, fuzzy msgid "(As this package is an extension to an already installed package, it is recommended it be installed.)" msgstr "Tento balíček není a nebude nainstalován." -#: src/yzyppwrapper.cc:465 +#: src/yzyppwrapper.cc:509 #, fuzzy msgid "(As this package complements some installed packages, it is suggested it be installed.)" msgstr "Tento balíček není a nebude nainstalován." -#: src/yzyppwrapper.cc:473 +#: src/yzyppwrapper.cc:517 msgid "Website:" msgstr "Webová stránka: " -#: src/yzyppwrapper.cc:475 +#: src/yzyppwrapper.cc:519 msgid "License:" msgstr "Licence: " -#: src/yzyppwrapper.cc:477 src/yzyppwrapper.cc:479 +#: src/yzyppwrapper.cc:521 src/yzyppwrapper.cc:523 msgid "Size:" msgstr "Velikost: " -#: src/yzyppwrapper.cc:484 +#: src/yzyppwrapper.cc:528 #, fuzzy msgid "Installed at:" msgstr "Nainstalováno:" -#: src/yzyppwrapper.cc:493 +#: src/yzyppwrapper.cc:537 #, fuzzy msgid "Last build from:" msgstr "" "\n" "Platný od:" -#: src/yzyppwrapper.cc:500 +#: src/yzyppwrapper.cc:544 msgid "Reboot needed!" msgstr "Je vyžadován restart!" -#: src/yzyppwrapper.cc:1998 +#: src/yzyppwrapper.cc:2050 msgid "Optional" msgstr "Volitelné" -#: src/yzyppwrapper.cc:2002 +#: src/yzyppwrapper.cc:2054 msgid "Documentation" msgstr "Dokumentace" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-cs-2.17.6/VERSION new/yast2-trans-cs-2.17.7/VERSION --- old/yast2-trans-cs-2.17.6/VERSION 2008-11-21 13:52:58.000000000 +0100 +++ new/yast2-trans-cs-2.17.7/VERSION 2008-11-28 16:06:47.000000000 +0100 @@ -1 +1 @@ -2.17.6 +2.17.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-wagon
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-wagon checked in at Fri Nov 28 16:16:24 CET 2008. -------- --- yast2-wagon/yast2-wagon.changes 2008-11-07 11:34:22.000000000 +0100 +++ yast2-wagon/yast2-wagon.changes 2008-11-28 13:05:20.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Nov 25 16:39:56 CET 2008 - locilka(a)suse.cz + +- Fixed potfile generation (bnc #446115). +- Text marked for translation (bnc #448634). +- 2.17.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-wagon-2.17.5.tar.bz2 New: ---- yast2-wagon-2.17.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-wagon.spec ++++++ --- /var/tmp/diff_new_pack.h17961/_old 2008-11-28 16:15:34.000000000 +0100 +++ /var/tmp/diff_new_pack.h17961/_new 2008-11-28 16:15:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-wagon (Version 2.17.5) +# spec file for package yast2-wagon (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-wagon -Version: 2.17.5 +Version: 2.17.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-wagon-2.17.5.tar.bz2 +Source0: yast2-wagon-2.17.6.tar.bz2 Prefix: /usr # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 @@ -46,7 +46,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-wagon-2.17.5 +%setup -n yast2-wagon-2.17.6 %build %{prefix}/bin/y2tool y2autoconf @@ -77,9 +77,13 @@ /usr/share/YaST2/modules/*.ybc %dir /usr/share/YaST2/control %{prefix}/share/applications/YaST2/*.desktop -/usr/share/YaST2/control/online_migration.xml +/usr/share/YaST2/control/*.xml %doc %{prefix}/share/doc/packages/yast2-wagon %changelog +* Tue Nov 25 2008 locilka(a)suse.cz +- Fixed potfile generation (bnc #446115). +- Text marked for translation (bnc #448634). +- 2.17.6 * Fri Nov 07 2008 locilka(a)suse.cz - Using PackagesUI for opening a package selector (bnc #435479). - 2.17.5 ++++++ yast2-wagon-2.17.5.tar.bz2 -> yast2-wagon-2.17.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.5/configure new/yast2-wagon-2.17.6/configure --- old/yast2-wagon-2.17.5/configure 2008-10-27 17:17:22.000000000 +0100 +++ new/yast2-wagon-2.17.6/configure 2008-11-28 13:09:48.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-wagon 2.17.2. +# Generated by GNU Autoconf 2.63 for yast2-wagon 2.17.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-wagon' PACKAGE_TARNAME='yast2-wagon' -PACKAGE_VERSION='2.17.2' -PACKAGE_STRING='yast2-wagon 2.17.2' +PACKAGE_VERSION='2.17.6' +PACKAGE_STRING='yast2-wagon 2.17.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-wagon 2.17.2 to adapt to many kinds of systems. +\`configure' configures yast2-wagon 2.17.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-wagon 2.17.2:";; + short | recursive ) echo "Configuration of yast2-wagon 2.17.6:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-wagon configure 2.17.2 +yast2-wagon configure 2.17.6 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-wagon $as_me 2.17.2, which was +It was created by yast2-wagon $as_me 2.17.6, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-wagon' - VERSION='2.17.2' + VERSION='2.17.6' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.17.2" +VERSION="2.17.6" RPMNAME="yast2-wagon" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3458,7 +3458,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-wagon $as_me 2.17.2, which was +This file was extended by yast2-wagon $as_me 2.17.6, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3508,7 +3508,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-wagon config.status 2.17.2 +yast2-wagon config.status 2.17.6 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -4136,3 +4136,10 @@ fi + +( cd src/config; + for xml in `ls *.xml`; do + ln -sf $xml `basename $xml .xml`.glade + done + ) +find src/config -name \*.glade | LC_ALL=C sort > POTFILES diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.5/configure.in new/yast2-wagon-2.17.6/configure.in --- old/yast2-wagon-2.17.5/configure.in 2008-10-27 17:17:19.000000000 +0100 +++ new/yast2-wagon-2.17.6/configure.in 2008-11-28 13:09:45.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-wagon, 2.17.2, http://bugs.opensuse.org/, yast2-wagon) +AC_INIT(yast2-wagon, 2.17.6, http://bugs.opensuse.org/, yast2-wagon) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.2" +VERSION="2.17.6" RPMNAME="yast2-wagon" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -167,3 +167,10 @@ testsuite/Makefile) AC_OUTPUT + +( cd src/config; + for xml in `ls *.xml`; do + ln -sf $xml `basename $xml .xml`.glade + done + ) +find src/config -name \*.glade | LC_ALL=C sort > POTFILES diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.5/configure.in.in new/yast2-wagon-2.17.6/configure.in.in --- old/yast2-wagon-2.17.5/configure.in.in 2008-10-13 09:30:41.000000000 +0200 +++ new/yast2-wagon-2.17.6/configure.in.in 2008-11-25 16:38:07.000000000 +0100 @@ -17,3 +17,11 @@ ## and generate the output... @YAST2-OUTPUT@ + +## Nasty hack: xgettext doesn't work for XML files, so let's symlink it +( cd src/config; + for xml in `ls *.xml`; do + ln -sf $xml `basename $xml .xml`.glade + done + ) +find src/config -name \*.glade | LC_ALL=C sort > POTFILES diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.5/online-migration.pot new/yast2-wagon-2.17.6/online-migration.pot --- old/yast2-wagon-2.17.5/online-migration.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.17.6/online-migration.pot 2008-11-28 13:05:39.000000000 +0100 @@ -0,0 +1,55 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-28 13:05+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/config/online_migration.glade:154 +msgid "Distribution Upgrade Settings" +msgstr "" + +#: src/config/online_migration.glade:178 +msgid "Online Migration" +msgstr "" + +#: src/config/online_migration.glade:186 +msgid "Preparation" +msgstr "" + +#: src/config/online_migration.glade:191 +msgid "Welcome" +msgstr "" + +#: src/config/online_migration.glade:199 src/config/online_migration.glade:206 +#: src/config/online_migration.glade:217 src/config/online_migration.glade:227 +#: src/config/online_migration.glade:237 +msgid "Renew Update Stack" +msgstr "" + +#: src/config/online_migration.glade:244 +msgid "Migration" +msgstr "" + +#: src/config/online_migration.glade:252 +msgid "Update" +msgstr "" + +#: src/config/online_migration.glade:282 +msgid "Registration" +msgstr "" + +#: src/config/online_migration.glade:289 +msgid "Finished" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.5/src/clients/wagon_selfupdate.ycp new/yast2-wagon-2.17.6/src/clients/wagon_selfupdate.ycp --- old/yast2-wagon-2.17.5/src/clients/wagon_selfupdate.ycp 2008-11-07 11:33:14.000000000 +0100 +++ new/yast2-wagon-2.17.6/src/clients/wagon_selfupdate.ycp 2008-11-24 15:11:32.000000000 +0100 @@ -147,6 +147,9 @@ symbol ret = `auto; + // Patches need solver run + Pkg::PkgSolve (true); + // Here the update stack updates itself integer selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.5/src/clients/wagon_update_proposal.ycp new/yast2-wagon-2.17.6/src/clients/wagon_update_proposal.ycp --- old/yast2-wagon-2.17.5/src/clients/wagon_update_proposal.ycp 2008-10-29 16:40:48.000000000 +0100 +++ new/yast2-wagon-2.17.6/src/clients/wagon_update_proposal.ycp 2008-11-28 13:04:43.000000000 +0100 @@ -41,7 +41,7 @@ ret = Wagon::ProposalSummary(); } else if (func == "AskUser") { - Report::Message ("There is nothing to set."); + Report::Message (_("There is nothing to set.")); ret = $[ "workflow_sequence" : `next ]; } else if (func == "Description") { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.5/VERSION new/yast2-wagon-2.17.6/VERSION --- old/yast2-wagon-2.17.5/VERSION 2008-11-07 11:35:41.000000000 +0100 +++ new/yast2-wagon-2.17.6/VERSION 2008-11-28 13:08:39.000000000 +0100 @@ -1 +1 @@ -2.17.5 +2.17.6 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.5/wagon.pot new/yast2-wagon-2.17.6/wagon.pot --- old/yast2-wagon-2.17.5/wagon.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.17.6/wagon.pot 2008-11-28 13:05:39.000000000 +0100 @@ -0,0 +1,123 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-28 13:05+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/clients/wagon_selfupdate.ycp:38 +msgid "Solving the package dependencies..." +msgstr "" + +#. TRANSLATORS: headline +#: src/clients/wagon_selfupdate.ycp:201 +msgid "Aborting the Upgrade" +msgstr "" + +#. TRANSLATORS: pop-up question +#: src/clients/wagon_selfupdate.ycp:203 +msgid "" +"Cannot continue without installing the required patches.\n" +"Are sure you want to abort the upgrade process?" +msgstr "" + +#: src/clients/wagon_selfupdate.ycp:205 +msgid "Abort Upgrade" +msgstr "" + +#: src/clients/wagon_update_proposal.ycp:44 +msgid "There is nothing to set." +msgstr "" + +#: src/clients/wagon_update_proposal.ycp:49 +msgid "Update Options" +msgstr "" + +#: src/clients/wagon_update_proposal.ycp:50 +msgid "&Update Options" +msgstr "" + +#: src/clients/wagon_update_url.ycp:27 +msgid "Select from where to get the update URL" +msgstr "" + +#: src/clients/wagon_update_url.ycp:46 +msgid "&Customer Center" +msgstr "" + +#: src/clients/wagon_update_url.ycp:52 +msgid "Custom &URL" +msgstr "" + +#: src/clients/wagon_update_url.ycp:60 +msgid "Update URL" +msgstr "" + +#. FIXME: ... +#: src/clients/wagon_update_url.ycp:63 +msgid "FIXME: some help text" +msgstr "" + +#. heading text +#: src/clients/welcome_in_wagon.ycp:28 +msgid "Welcome" +msgstr "" + +#: src/clients/welcome_in_wagon.ycp:31 +msgid "" +"This tool will help to update the\n" +"running system to a service pack.\n" +"\n" +"Click 'Next' to start the update." +msgstr "" + +#. help text +#: src/clients/welcome_in_wagon.ycp:38 +msgid "This tools updates the running system to a service pack." +msgstr "" + +#. Report error but let user go further +#. Might help us in the future +#: src/clients/welcome_in_wagon.ycp:58 +msgid "Cannot initialize package manager." +msgstr "" + +#. TRANSLATORS: error message +#: src/modules/Wagon.ycp:95 +msgid "No workflow defined." +msgstr "" + +#: src/modules/Wagon.ycp:173 +msgid "" +"\n" +"This module does not support command-line interface.\n" +"To do so, please, use zypper instead.\n" +msgstr "" + +#: src/modules/Wagon.ycp:179 +msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option." +msgstr "" + +#. popup heading, with rich text widget and Yes/No buttons +#: src/modules/Wagon.ycp:224 +msgid "Do you accept this license agreement?" +msgstr "" + +#: src/modules/Wagon.ycp:283 +msgid "Distribution Upgrade" +msgstr "" + +#: src/modules/Wagon.ycp:284 +msgid "FIXME" +msgstr "" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-update
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-update checked in at Fri Nov 28 16:16:09 CET 2008. -------- --- yast2-update/yast2-update.changes 2008-11-20 14:15:31.000000000 +0100 +++ yast2-update/yast2-update.changes 2008-11-28 10:53:50.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 28 10:52:15 CET 2008 - locilka(a)suse.cz + +- Checking spec for /var partition if it is a persisten device + name (bnc #448577). +- 2.17.14 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-update-2.17.13.tar.bz2 New: ---- yast2-update-2.17.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.k17348/_old 2008-11-28 16:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.k17348/_new 2008-11-28 16:15:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.17.13) +# spec file for package yast2-update (Version 2.17.14) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-update -Version: 2.17.13 +Version: 2.17.14 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.17.13.tar.bz2 +Source0: yast2-update-2.17.14.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-storage yast2-testsuite # Packages::GetBaseSourceID @@ -82,7 +82,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.17.13 +%setup -n yast2-update-2.17.14 %build %{prefix}/bin/y2tool y2autoconf @@ -130,6 +130,10 @@ /usr/share/YaST2/clients/update.ycp /usr/share/YaST2/clients/run_update.ycp %changelog +* Fri Nov 28 2008 locilka(a)suse.cz +- Checking spec for /var partition if it is a persisten device + name (bnc #448577). +- 2.17.14 * Thu Nov 20 2008 aschnell(a)suse.de - added warning for use of kernel device names in /etc/fstab during update (bnc #429019) ++++++ yast2-update-2.17.13.tar.bz2 -> yast2-update-2.17.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.13/configure new/yast2-update-2.17.14/configure --- old/yast2-update-2.17.13/configure 2008-11-20 14:07:31.000000000 +0100 +++ new/yast2-update-2.17.14/configure 2008-10-09 19:47:43.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-update 2.17.13. +# Generated by GNU Autoconf 2.61 for yast2-update 2.17.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.17.13' -PACKAGE_STRING='yast2-update 2.17.13' +PACKAGE_VERSION='2.17.7' +PACKAGE_STRING='yast2-update 2.17.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-update 2.17.13 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.17.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.17.13:";; + short | recursive ) echo "Configuration of yast2-update 2.17.7:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.17.13 +yast2-update configure 2.17.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-update $as_me 2.17.13, which was +It was created by yast2-update $as_me 2.17.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.17.13' + VERSION='2.17.7' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.13" +VERSION="2.17.7" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3306,7 +3306,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-update $as_me 2.17.13, which was +This file was extended by yast2-update $as_me 2.17.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3349,7 +3349,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-update config.status 2.17.13 +yast2-update config.status 2.17.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.13/configure.in new/yast2-update-2.17.14/configure.in --- old/yast2-update-2.17.13/configure.in 2008-11-20 14:07:26.000000000 +0100 +++ new/yast2-update-2.17.14/configure.in 2008-10-09 19:47:41.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.17.13, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.17.7, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.13" +VERSION="2.17.7" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.13/kernel-update-tool.pot new/yast2-update-2.17.14/kernel-update-tool.pot --- old/yast2-update-2.17.13/kernel-update-tool.pot 2008-11-20 14:08:50.000000000 +0100 +++ new/yast2-update-2.17.14/kernel-update-tool.pot 2008-04-29 13:09:07.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-20 14:08+0100\n" +"POT-Creation-Date: 2008-04-29 13:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.13/src/modules/RootPart.ycp new/yast2-update-2.17.14/src/modules/RootPart.ycp --- old/yast2-update-2.17.13/src/modules/RootPart.ycp 2008-11-20 14:07:23.000000000 +0100 +++ new/yast2-update-2.17.14/src/modules/RootPart.ycp 2008-11-28 10:54:39.000000000 +0100 @@ -6,7 +6,7 @@ * Purpose: Responsible for searching of root partitions and * mounting of target partitions. * - * $Id: RootPart.ycp 53477 2008-11-20 13:07:22Z aschnell $ + * $Id: RootPart.ycp 53685 2008-11-28 09:55:23Z locilka $ */ { module "RootPart"; @@ -1211,7 +1211,8 @@ list <string> realdisks = []; foreach (string s, map m, (map <string, map>) Storage::GetOndiskTarget (), { - if (Storage::DeviceRealDisk (s)) + // BNC #448577, checking device + if (Storage::IsKernelDeviceName(s) && Storage::DeviceRealDisk (s)) realdisks = add (realdisks, s); }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.13/update.pot new/yast2-update-2.17.14/update.pot --- old/yast2-update-2.17.13/update.pot 2008-11-20 14:08:50.000000000 +0100 +++ new/yast2-update-2.17.14/update.pot 2008-04-29 13:09:07.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-20 14:08+0100\n" +"POT-Creation-Date: 2008-04-29 13:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -129,7 +129,7 @@ #. screen title for update options #. this is a heading -#: src/clients/inst_update.ycp:26 src/clients/update_proposal.ycp:553 +#: src/clients/inst_update.ycp:26 src/clients/update_proposal.ycp:609 msgid "Update Options" msgstr "" @@ -151,15 +151,15 @@ #. label - name of sustem to update #. label for an unknown installed system #: src/clients/inst_update.ycp:72 src/clients/inst_update.ycp:73 -#: src/include/rootpart.ycp:68 src/include/rootpart.ycp:74 -#: src/include/rootpart.ycp:91 src/modules/RootPart.ycp:123 -#: src/modules/RootPart.ycp:1509 +#: src/include/rootpart.ycp:67 src/include/rootpart.ycp:73 +#: src/include/rootpart.ycp:90 src/modules/RootPart.ycp:123 +#: src/modules/RootPart.ycp:1428 msgid "Unknown" msgstr "" #. label showing to which version we are updating #. TRANSLATORS: proposal summary item, %1 is a product name -#: src/clients/inst_update.ycp:78 src/clients/update_proposal.ycp:465 +#: src/clients/inst_update.ycp:78 src/clients/update_proposal.ycp:521 #, ycp-format msgid "Update to %1" msgstr "" @@ -187,6 +187,12 @@ msgid "Only U&pdate Installed Packages" msgstr "" +#. check box label +#. translator: add a & shortcut +#: src/clients/inst_update.ycp:117 +msgid "&Delete Unmaintained Packages" +msgstr "" + #. help text for dialog "update options" 1/4 #: src/clients/inst_update.ycp:125 msgid "" @@ -229,41 +235,41 @@ msgstr "" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:65 +#: src/clients/packages_proposal.ycp:69 #, ycp-format msgid "Packages to Update: %1" msgstr "" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:68 +#: src/clients/packages_proposal.ycp:72 #, ycp-format msgid "New Packages to Install: %1" msgstr "" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:71 +#: src/clients/packages_proposal.ycp:75 #, ycp-format msgid "Packages to Remove: %1" msgstr "" #. part of summary, %1 is size of packages (in MB or GB) -#: src/clients/packages_proposal.ycp:74 +#: src/clients/packages_proposal.ycp:78 #, ycp-format msgid "Total Size of Packages to Update: %1" msgstr "" #. warning text -#: src/clients/packages_proposal.ycp:82 +#: src/clients/packages_proposal.ycp:86 msgid "Cannot solve all conflicts. Manual intervention is required." msgstr "" #. this is a heading -#: src/clients/packages_proposal.ycp:132 +#: src/clients/packages_proposal.ycp:133 msgid "Packages" msgstr "" #. this is a menu entry -#: src/clients/packages_proposal.ycp:134 +#: src/clients/packages_proposal.ycp:135 msgid "&Packages" msgstr "" @@ -280,7 +286,7 @@ #. inform user in the proposal about the failed mount #. error report -#: src/clients/rootpart_proposal.ycp:95 src/include/rootpart.ycp:342 +#: src/clients/rootpart_proposal.ycp:95 src/include/rootpart.ycp:323 msgid "Failed to mount target system" msgstr "" @@ -294,7 +300,7 @@ msgid "&Selected for Update" msgstr "" -#: src/clients/run_update.ycp:37 +#: src/clients/run_update.ycp:36 msgid "&Update" msgstr "" @@ -305,7 +311,7 @@ #. part of error popup message #. error message in proposal -#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:373 +#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:429 msgid "Cannot read the current RPM Database." msgstr "" @@ -316,7 +322,7 @@ msgstr "" #. continue-cancel popup -#: src/clients/update_proposal.ycp:295 +#: src/clients/update_proposal.ycp:351 msgid "" "The installed product is not compatible with the product\n" "on the installation media. If you try to update using the\n" @@ -325,26 +331,26 @@ msgstr "" #. error message in proposal -#: src/clients/update_proposal.ycp:388 +#: src/clients/update_proposal.ycp:444 msgid "The installed product is not compatible with the product on the installation media." msgstr "" #. Can't find any software data, probably a installation media error #. error message -#: src/clients/update_proposal.ycp:399 +#: src/clients/update_proposal.ycp:455 msgid "Cannot read package data from installation media. Media error?" msgstr "" #. TRANSLATORS: unknown product (label) #. TRANSLATORS: unknown product name -#: src/clients/update_proposal.ycp:405 src/clients/update_proposal.ycp:413 -#: src/clients/update_proposal.ycp:442 src/clients/update_proposal.ycp:444 +#: src/clients/update_proposal.ycp:461 src/clients/update_proposal.ycp:469 +#: src/clients/update_proposal.ycp:498 src/clients/update_proposal.ycp:500 msgid "Unknown product" msgstr "" #. TRANSLATORS: proposal error, %1 is the version of installed system #. %2 is the version being installed -#: src/clients/update_proposal.ycp:425 +#: src/clients/update_proposal.ycp:481 #, ycp-format msgid "" "Updating system to another version (%1 -> %2) is not supported on the running system. \n" @@ -353,38 +359,43 @@ msgstr "" #. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names -#: src/clients/update_proposal.ycp:440 +#: src/clients/update_proposal.ycp:496 #, ycp-format msgid "Warning: Updating from '%1' to '%2', products do not exactly match." msgstr "" +#. Proposal for removing packages which are not maintained any more +#: src/clients/update_proposal.ycp:527 +msgid "Delete unmaintained packages" +msgstr "" + #. Proposal for backup during update -#: src/clients/update_proposal.ycp:476 +#: src/clients/update_proposal.ycp:532 msgid "Only update installed packages" msgstr "" #. proposal string -#: src/clients/update_proposal.ycp:484 +#: src/clients/update_proposal.ycp:540 msgid "Update based on patterns" msgstr "" #. Proposal for selection during update, %1 stands for selection name -#: src/clients/update_proposal.ycp:500 +#: src/clients/update_proposal.ycp:556 #, ycp-format msgid "Update based on selection \"%1\"" msgstr "" #. TRANSLATORS: proposal dialog help -#: src/clients/update_proposal.ycp:509 +#: src/clients/update_proposal.ycp:565 msgid "" "<big>Update Options</big>\n" "Here you can choose how your system is going to be updated.\n" -"Choose whether only installed packages should be updated or whether new ones should be installed also \n" +"Choose whether only installed packages should be updated or also new ones should be installed\n" "(the default selection), and whether unmaintained packages should be deleted." msgstr "" #. this is a menu entry -#: src/clients/update_proposal.ycp:555 +#: src/clients/update_proposal.ycp:611 msgid "&Update Options" msgstr "" @@ -408,33 +419,32 @@ msgid "Update System Configuration" msgstr "" -#. TRANSLATORS: dialog caption -#: src/config/update.glade:71 src/modules/RootPart.ycp:1675 +#: src/config/update.glade:71 msgid "Update Configuration" msgstr "" #. Table item (unknown system) -#: src/include/rootpart.ycp:61 +#: src/include/rootpart.ycp:60 msgid "Unknown Linux" msgstr "" #. Table item (unknown system) -#: src/include/rootpart.ycp:64 +#: src/include/rootpart.ycp:63 msgid "Unknown or Non-Linux" msgstr "" -#: src/include/rootpart.ycp:84 +#: src/include/rootpart.ycp:83 #, ycp-format msgid "%1 (%2)" msgstr "" #. label for selection of root partition (for boot) -#: src/include/rootpart.ycp:152 +#: src/include/rootpart.ycp:138 msgid "Partition or System to Boot:" msgstr "" #. help text for root partition dialog (for boot) -#: src/include/rootpart.ycp:155 +#: src/include/rootpart.ycp:141 msgid "" "\n" "Select the partition or system to boot.\n" @@ -442,12 +452,12 @@ msgstr "" #. label for selection of root partition (for update) -#: src/include/rootpart.ycp:163 +#: src/include/rootpart.ycp:149 msgid "Partition or System to Update:" msgstr "" #. help text for root partition dialog (for update) -#: src/include/rootpart.ycp:166 +#: src/include/rootpart.ycp:152 msgid "" "\n" "Select the partition or system to update.\n" @@ -455,12 +465,12 @@ msgstr "" #. headline for dialog "Select for update" -#: src/include/rootpart.ycp:174 +#: src/include/rootpart.ycp:160 msgid "Select for Update" msgstr "" #. help text for root partition dialog (general part) -#: src/include/rootpart.ycp:179 +#: src/include/rootpart.ycp:165 msgid "" "\n" "Show All Partitions expands the list to a\n" @@ -469,66 +479,54 @@ msgstr "" #. table header -#: src/include/rootpart.ycp:196 +#: src/include/rootpart.ycp:182 msgid "System" msgstr "" #. table header item -#: src/include/rootpart.ycp:198 +#: src/include/rootpart.ycp:184 msgid "Partition" msgstr "" #. table header item -#: src/include/rootpart.ycp:200 +#: src/include/rootpart.ycp:186 msgid "Architecture" msgstr "" #. table header item -#: src/include/rootpart.ycp:202 +#: src/include/rootpart.ycp:188 msgid "File System" msgstr "" #. table header item -#: src/include/rootpart.ycp:204 +#: src/include/rootpart.ycp:190 msgid "Label" msgstr "" #. check box -#: src/include/rootpart.ycp:211 +#: src/include/rootpart.ycp:197 msgid "&Show All Partitions" msgstr "" #. pushbutton to (rightaway) boot the system selected above -#: src/include/rootpart.ycp:241 +#: src/include/rootpart.ycp:222 msgid "&Boot" msgstr "" #. continue-cancel popup -#: src/include/rootpart.ycp:316 +#: src/include/rootpart.ycp:297 msgid "" "No installed system that can be upgraded with this product was found\n" "on the selected partition." msgstr "" #. continue-cancel popup -#: src/include/rootpart.ycp:323 +#: src/include/rootpart.ycp:304 msgid "" "The architecture of the system installed in the selected partition\n" "is different than the one of this product." msgstr "" -#. pop-up question -#: src/include/rootpart.ycp:351 -msgid "" -"A possibly incomplete installation has been detected on the selected partition.\n" -"Are sure you want to use it anyway?" -msgstr "" - -#. button label -#: src/include/rootpart.ycp:354 -msgid "&Yes, Use It" -msgstr "" - #. * #. * Link to SDB article concerning renaming of devices. #. @@ -550,7 +548,7 @@ msgstr "" #. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.ycp:216 +#: src/modules/RootPart.ycp:206 #, ycp-format msgid "" "Cannot unmount partition %1.\n" @@ -561,28 +559,28 @@ msgstr "" #. label, %1 is partition -#: src/modules/RootPart.ycp:281 +#: src/modules/RootPart.ycp:271 #, ycp-format msgid "Checking partition %1" msgstr "" -#: src/modules/RootPart.ycp:321 +#: src/modules/RootPart.ycp:311 msgid "Show &Details" msgstr "" -#: src/modules/RootPart.ycp:408 +#: src/modules/RootPart.ycp:398 #, ycp-format msgid "Checking file system on %1..." msgstr "" #. popup headline -#: src/modules/RootPart.ycp:432 +#: src/modules/RootPart.ycp:422 msgid "File System Check Failed" msgstr "" #. popup question (continue/cancel dialog) #. %1 is a device name such as /dev/hda5 -#: src/modules/RootPart.ycp:436 +#: src/modules/RootPart.ycp:426 #, ycp-format msgid "" "The file system check of device %1 has failed.\n" @@ -591,30 +589,21 @@ msgstr "" #. button -#: src/modules/RootPart.ycp:442 +#: src/modules/RootPart.ycp:432 msgid "&Skip Mounting" msgstr "" -#: src/modules/RootPart.ycp:816 -#, ycp-format -msgid "" -"Some partitions in the system on %1 are mounted by kernel-device name. This is\n" -"not reliable for the update since kernel-device names are unfortunately not\n" -"persistent. It is strongly recommended to start the old system and change the\n" -"mount-by method to any other method for all partitions." -msgstr "" - #. yes-no popup -#: src/modules/RootPart.ycp:887 +#: src/modules/RootPart.ycp:835 msgid "Incorrect password. Try again?" msgstr "" #. TRANSLATORS: a popup headline -#: src/modules/RootPart.ycp:974 +#: src/modules/RootPart.ycp:922 msgid "Warning" msgstr "" -#: src/modules/RootPart.ycp:979 +#: src/modules/RootPart.ycp:927 #, ycp-format msgid "" "Your /boot partition is too small (%1 MB).\n" @@ -626,7 +615,7 @@ msgstr "" #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.ycp:1051 +#: src/modules/RootPart.ycp:999 #, ycp-format msgid "" "The partition %1 could not be mounted.\n" @@ -640,45 +629,45 @@ msgstr "" #. push button -#: src/modules/RootPart.ycp:1065 +#: src/modules/RootPart.ycp:1013 msgid "&Specify Mount Options" msgstr "" #. popup heading -#: src/modules/RootPart.ycp:1084 +#: src/modules/RootPart.ycp:1032 msgid "Mount Options" msgstr "" #. text entry label -#: src/modules/RootPart.ycp:1087 +#: src/modules/RootPart.ycp:1035 msgid "&Mount Point" msgstr "" #. tex entry label -#: src/modules/RootPart.ycp:1090 +#: src/modules/RootPart.ycp:1038 msgid "&Device" msgstr "" #. text entry label -#: src/modules/RootPart.ycp:1093 +#: src/modules/RootPart.ycp:1041 msgid "" "&File System\n" "(empty for autodetection)" msgstr "" #. error message -#: src/modules/RootPart.ycp:1171 +#: src/modules/RootPart.ycp:1119 #, ycp-format msgid "The /var partition %1 could not be mounted.\n" msgstr "" #. error message -#: src/modules/RootPart.ycp:1222 +#: src/modules/RootPart.ycp:1170 msgid "Unable to mount /var partition with this disk configuration.\n" msgstr "" #. popup message, %1 will be replace with the name of the logfile -#: src/modules/RootPart.ycp:1247 +#: src/modules/RootPart.ycp:1195 #, ycp-format msgid "" "Partitions could not be mounted.\n" @@ -687,36 +676,40 @@ msgstr "" #. error message -#: src/modules/RootPart.ycp:1277 +#: src/modules/RootPart.ycp:1225 msgid "No fstab found." msgstr "" #. message part 1 -#: src/modules/RootPart.ycp:1297 +#: src/modules/RootPart.ycp:1245 msgid "The root partition in /etc/fstab has an invalid root device.\n" msgstr "" #. message part 2 -#: src/modules/RootPart.ycp:1299 +#: src/modules/RootPart.ycp:1247 #, ycp-format msgid "It is currently mounted as %1 but listed as %2.\n" msgstr "" -#: src/modules/RootPart.ycp:1601 -msgid "Evaluating root partition. One moment please..." -msgstr "" - #. intermediate popup while mounting partitions -#: src/modules/RootPart.ycp:1660 +#: src/modules/RootPart.ycp:1539 msgid "Mounting partitions. One moment please..." msgstr "" +#: src/modules/RootPart.ycp:1553 +msgid "xxx" +msgstr "" + +#: src/modules/RootPart.ycp:1554 +msgid "Evaluating root partition. One moment please..." +msgstr "" + #. TRANSLATORS: "Update to: $product_name" -#: src/modules/Update.ycp:282 +#: src/modules/Update.ycp:277 msgid "Unknown Product" msgstr "" #. TRANSLATORS: check-box, it might happen that we need to downgrade some packages during update -#: src/modules/Update.ycp:723 +#: src/modules/Update.ycp:687 msgid "Allow Package Downgrade" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.13/VERSION new/yast2-update-2.17.14/VERSION --- old/yast2-update-2.17.13/VERSION 2008-11-20 14:05:50.000000000 +0100 +++ new/yast2-update-2.17.14/VERSION 2008-11-28 10:54:24.000000000 +0100 @@ -1 +1 @@ -2.17.13 +2.17.14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-security
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-security checked in at Fri Nov 28 16:15:24 CET 2008. -------- --- yast2-security/yast2-security.changes 2008-11-18 00:13:29.000000000 +0100 +++ yast2-security/yast2-security.changes 2008-11-28 13:37:22.280007000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 28 13:29:35 CET 2008 - ug(a)suse.de + +- conflict in rnc file fixed +- 2.17.12 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-security-2.17.11.tar.bz2 New: ---- yast2-security-2.17.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-security.spec ++++++ --- /var/tmp/diff_new_pack.j15789/_old 2008-11-28 16:14:49.000000000 +0100 +++ /var/tmp/diff_new_pack.j15789/_new 2008-11-28 16:14:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-security (Version 2.17.11) +# spec file for package yast2-security (Version 2.17.12) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-security -Version: 2.17.11 +Version: 2.17.12 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-security-2.17.11.tar.bz2 +Source0: yast2-security-2.17.12.tar.bz2 Prefix: /usr BuildRequires: doxygen perl-XML-Writer pkg-config update-desktop-files yast2-devtools yast2-pam yast2-testsuite # new Pam.ycp API @@ -49,7 +49,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-security-2.17.11 +%setup -n yast2-security-2.17.12 %build %{prefix}/bin/y2tool y2autoconf @@ -82,8 +82,10 @@ /usr/share/YaST2/scrconf/*.scr /usr/share/YaST2/schema/autoyast/rnc/security.rnc %doc %{prefix}/share/doc/packages/yast2-security - %changelog +* Fri Nov 28 2008 ug(a)suse.de +- conflict in rnc file fixed +- 2.17.12 * Thu Nov 13 2008 ug(a)suse.de - rnc file fixed - 2.17.11 ++++++ yast2-security-2.17.11.tar.bz2 -> yast2-security-2.17.12.tar.bz2 ++++++ ++++ 3964 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-security-2.17.11/configure.in new/yast2-security-2.17.12/configure.in --- old/yast2-security-2.17.11/configure.in 2008-04-30 13:06:40.000000000 +0200 +++ new/yast2-security-2.17.12/configure.in 2008-11-28 13:30:27.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-security dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-security, 2.16.0, http://bugs.opensuse.org/, yast2-security) +AC_INIT(yast2-security, 2.17.12, http://bugs.opensuse.org/, yast2-security) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.0" +VERSION="2.17.12" RPMNAME="yast2-security" MAINTAINER="Jiri Suchomel <jsuchome(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-security-2.17.11/src/security.rnc new/yast2-security-2.17.12/src/security.rnc --- old/yast2-security-2.17.11/src/security.rnc 2008-11-13 15:43:00.000000000 +0100 +++ new/yast2-security-2.17.12/src/security.rnc 2008-11-28 13:29:29.000000000 +0100 @@ -18,7 +18,7 @@ gid_max = element gid_max { text } gid_min = element gid_min { text } group_encryption = element group_encryption { text } -ip_forward = element ip_forward { text } +sec_ip_forward = element ip_forward { text } ip_tcp_syncookies = element ip_tcp_syncookies { text } ipv6_forward = element ipv6_forward { text } kdm_shutdown = element kdm_shutdown { text } @@ -96,7 +96,7 @@ | userdel_postcmd | userdel_precmd | group_encryption - | ip_forward + | sec_ip_forward | displaymanager_shutdown | passwd_remember_history security = element security { y2_security* } 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-security-2.17.11/VERSION new/yast2-security-2.17.12/VERSION --- old/yast2-security-2.17.11/VERSION 2008-11-13 15:43:10.000000000 +0100 +++ new/yast2-security-2.17.12/VERSION 2008-11-28 13:30:04.000000000 +0100 @@ -1 +1 @@ -2.17.11 +2.17.12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-qt
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-qt checked in at Fri Nov 28 16:15:08 CET 2008. -------- --- yast2-qt/yast2-qt.changes 2008-11-28 12:14:29.000000000 +0100 +++ yast2-qt/yast2-qt.changes 2008-11-28 13:43:03.463516000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 28 13:38:04 CET 2008 - sh(a)suse.de + +- Last fix (bnc #449804) breaks yast2 sysconfig editor - use + QHeaderView::ResizeToContents instead of QHeaderView::Stretch +- V 2.17.23 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-qt-2.17.22.tar.bz2 New: ---- yast2-qt-2.17.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.y14973/_old 2008-11-28 16:14:19.000000000 +0100 +++ /var/tmp/diff_new_pack.y14973/_new 2008-11-28 16:14:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.17.22) +# spec file for package yast2-qt (Version 2.17.23) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ Name: yast2-qt -Version: 2.17.22 +Version: 2.17.23 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.17.22.tar.bz2 +Source0: yast2-qt-2.17.23.tar.bz2 BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libdrm-devel @@ -120,6 +120,10 @@ %changelog * Fri Nov 28 2008 sh(a)suse.de +- Last fix (bnc #449804) breaks yast2 sysconfig editor - use + QHeaderView::ResizeToContents instead of QHeaderView::Stretch +- V 2.17.23 +* Fri Nov 28 2008 sh(a)suse.de - Fixed bnc #449804: Wizard navigation tree always cuts off items - V 2.17.22 * Wed Nov 26 2008 coolo(a)suse.de ++++++ yast2-qt-2.17.22.tar.bz2 -> yast2-qt-2.17.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.22/package/yast2-qt.changes new/yast2-qt-2.17.23/package/yast2-qt.changes --- old/yast2-qt-2.17.22/package/yast2-qt.changes 2008-11-28 12:14:15.000000000 +0100 +++ new/yast2-qt-2.17.23/package/yast2-qt.changes 2008-11-28 13:42:17.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 28 13:38:04 CET 2008 - sh(a)suse.de + +- Last fix (bnc #449804) breaks yast2 sysconfig editor - use + QHeaderView::ResizeToContents instead of QHeaderView::Stretch +- V 2.17.23 + +------------------------------------------------------------------- Fri Nov 28 12:12:01 CET 2008 - sh(a)suse.de - Fixed bnc #449804: Wizard navigation tree always cuts off items diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.22/src/YQWizard.cc new/yast2-qt-2.17.23/src/YQWizard.cc --- old/yast2-qt-2.17.22/src/YQWizard.cc 2008-11-28 12:14:15.000000000 +0100 +++ new/yast2-qt-2.17.23/src/YQWizard.cc 2008-11-28 13:42:17.000000000 +0100 @@ -510,7 +510,7 @@ vbox->addWidget( _tree ); _tree->header()->hide(); - _tree->header()->setResizeMode( 0, QHeaderView::Stretch ); + _tree->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); _tree->setRootIsDecorated( true ); _tree->setSortByInsertionSequence( true ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.22/VERSION.cmake new/yast2-qt-2.17.23/VERSION.cmake --- old/yast2-qt-2.17.22/VERSION.cmake 2008-11-28 12:14:15.000000000 +0100 +++ new/yast2-qt-2.17.23/VERSION.cmake 2008-11-28 13:42:17.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "22") +SET(VERSION_PATCH "23") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-printer
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-printer checked in at Fri Nov 28 16:14:40 CET 2008. -------- --- yast2-printer/yast2-printer.changes 2008-11-27 14:33:50.000000000 +0100 +++ yast2-printer/yast2-printer.changes 2008-11-28 13:16:39.493282000 +0100 @@ -1,0 +2,16 @@ +Fri Nov 28 12:37:23 CET 2008 - jsmeix(a)suse.de + +- Removed the nasty inline bash scripts in connectionwizard.ycp + and replaced them by our well known external tools from + the old yast2-printer module test_device, test_remote_socket, + test_remote_lpd, test_remote_ipp, test_remote_smb, and + test_remote_novell and called them in a safe environment + via Printerlib::ExecuteBashCommand (in particular using a safe + locale which is required for the scripts to work correctly) + so that now the connection tests in the Connection Wizard should + again work as good as before in the old yast2-printer module + and provided an error popup with details when a test fails + (see Novell/Suse Bugzilla bnc#445543). +- 2.17.48 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-printer-2.17.47.tar.bz2 New: ---- yast2-printer-2.17.48.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.w12375/_old 2008-11-28 16:12:30.000000000 +0100 +++ /var/tmp/diff_new_pack.w12375/_new 2008-11-28 16:12:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.17.47) +# spec file for package yast2-printer (Version 2.17.48) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://en.opensuse.org/YaST/Modules/Printer Name: yast2-printer -Version: 2.17.47 +Version: 2.17.48 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.17.47.tar.bz2 +Source0: yast2-printer-2.17.48.tar.bz2 Prefix: /usr BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Recommends: netcat @@ -64,7 +64,7 @@ Michal Zugec <mzugec(a)suse.cz> %prep -%setup -n yast2-printer-2.17.47 +%setup -n yast2-printer-2.17.48 %build %{prefix}/bin/y2tool y2autoconf @@ -107,6 +107,12 @@ %{prefix}/lib/YaST2/bin/determine_printer_driver_options %{prefix}/lib/YaST2/bin/cups_client_only %{prefix}/lib/YaST2/bin/modify_cupsd_conf +%{prefix}/lib/YaST2/bin/test_device +%{prefix}/lib/YaST2/bin/test_remote_ipp +%{prefix}/lib/YaST2/bin/test_remote_lpd +%{prefix}/lib/YaST2/bin/test_remote_novell +%{prefix}/lib/YaST2/bin/test_remote_smb +%{prefix}/lib/YaST2/bin/test_remote_socket #Documentation %dir %{prefix}/share/doc/packages/yast2-printer %{prefix}/share/doc/packages/yast2-printer/COPYING @@ -118,6 +124,19 @@ %exclude %{prefix}/share/doc/packages/yast2-printer/COPYING %exclude %{prefix}/share/doc/packages/yast2-printer/README %changelog +* Fri Nov 28 2008 jsmeix(a)suse.de +- Removed the nasty inline bash scripts in connectionwizard.ycp + and replaced them by our well known external tools from + the old yast2-printer module test_device, test_remote_socket, + test_remote_lpd, test_remote_ipp, test_remote_smb, and + test_remote_novell and called them in a safe environment + via Printerlib::ExecuteBashCommand (in particular using a safe + locale which is required for the scripts to work correctly) + so that now the connection tests in the Connection Wizard should + again work as good as before in the old yast2-printer module + and provided an error popup with details when a test fails + (see Novell/Suse Bugzilla bnc#445543). +- 2.17.48 * Thu Nov 27 2008 jsmeix(a)suse.de - Several fixes regarding the Connection Wizard like misaligned layout, wrong Device URIs, ++++++ yast2-printer-2.17.47.tar.bz2 -> yast2-printer-2.17.48.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/configure new/yast2-printer-2.17.48/configure --- old/yast2-printer-2.17.47/configure 2008-11-27 14:29:52.000000000 +0100 +++ new/yast2-printer-2.17.48/configure 2008-11-28 12:46:59.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-printer 2.17.47. +# Generated by GNU Autoconf 2.61 for yast2-printer 2.17.48. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.17.47' -PACKAGE_STRING='yast2-printer 2.17.47' +PACKAGE_VERSION='2.17.48' +PACKAGE_STRING='yast2-printer 2.17.48' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-printer 2.17.47 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.17.48 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.17.47:";; + short | recursive ) echo "Configuration of yast2-printer 2.17.48:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.17.47 +yast2-printer configure 2.17.48 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-printer $as_me 2.17.47, which was +It was created by yast2-printer $as_me 2.17.48, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.17.47' + VERSION='2.17.48' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.47" +VERSION="2.17.48" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-printer $as_me 2.17.47, which was +This file was extended by yast2-printer $as_me 2.17.48, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-printer config.status 2.17.47 +yast2-printer config.status 2.17.48 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/configure.in new/yast2-printer-2.17.48/configure.in --- old/yast2-printer-2.17.47/configure.in 2008-11-27 14:29:47.000000000 +0100 +++ new/yast2-printer-2.17.48/configure.in 2008-11-28 12:46:55.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.17.47, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.17.48, http://bugs.opensuse.org/, yast2-printer) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.47" +VERSION="2.17.48" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/src/connectionwizard.ycp new/yast2-printer-2.17.48/src/connectionwizard.ycp --- old/yast2-printer-2.17.47/src/connectionwizard.ycp 2008-11-27 14:29:45.000000000 +0100 +++ new/yast2-printer-2.17.48/src/connectionwizard.ycp 2008-11-28 12:26:47.000000000 +0100 @@ -34,6 +34,7 @@ import "Label"; import "Printer"; +import "Printerlib"; import "Popup"; import "Wizard"; @@ -216,7 +217,7 @@ ) ), `Left - ( `InputField( `id(`port), text[1]:"", text[2]:"" ) + ( `InputField( `id(`port_or_queue), text[1]:"", text[2]:"" ) ), `Left ( // TRANSLATORS: Button to test remote printer machine @@ -738,28 +739,35 @@ { Popup::Error( _("Servername and printer couldn't be empty!") ); } else - { connection_uri = "smb://"; - if( size( smb["user"]:"" ) > 0 - && size( smb["pass"]:"" ) > 0 + { if( ( size( smb["user"]:"" ) > 0 && size( smb["pass"]:"" ) == 0 ) + || ( size( smb["user"]:"" ) == 0 && size( smb["pass"]:"" ) > 0 ) ) - { connection_uri = sformat( "%1%2:%3@", - connection_uri, - smb["user"]:"", - smb["pass"]:"" - ); + { Popup::Error( _("Both user and password must be specified!") ); } - if( size( smb["domain"]:"" ) > 0 ) - { connection_uri = sformat( "%1%2/", + else + { connection_uri = "smb://"; + if( size( smb["user"]:"" ) > 0 + && size( smb["pass"]:"" ) > 0 + ) + { connection_uri = sformat( "%1%2:%3@", + connection_uri, + smb["user"]:"", + smb["pass"]:"" + ); + } + if( size( smb["domain"]:"" ) > 0 ) + { connection_uri = sformat( "%1%2/", + connection_uri, + smb["domain"]:"" + ); + } + connection_uri = sformat( "%1%2/%3", connection_uri, - smb["domain"]:"" + smb["hostname"]:"", + smb["printer"]:"" ); + valid = true; } - connection_uri = sformat( "%1%2/%3", - connection_uri, - smb["hostname"]:"", - smb["printer"]:"" - ); - valid = true; } if( valid ) { connection_model = (string)UI::QueryWidget( `id("manufacturers_combo_box"), `Value ); @@ -771,7 +779,7 @@ break; case(`tcp): map<string, any> tcp = $[ "hostname" : UI::QueryWidget( `hostname, `Value ), - "port" : UI::QueryWidget( `port, `Value ) + "port" : UI::QueryWidget( `port_or_queue, `Value ) ]; if( size( tcp["hostname"]:"" ) > 0 && size( tcp["port"]:"" ) > 0 @@ -792,7 +800,7 @@ break; case(`lpd): map<string, any> lpd = $[ "hostname" : UI::QueryWidget( `hostname, `Value ), - "queue" : UI::QueryWidget( `port, `Value ) + "queue" : UI::QueryWidget( `port_or_queue, `Value ) ]; if( size( lpd["hostname"]:"" ) > 0 && size( lpd["queue"]:"" ) > 0 @@ -813,7 +821,7 @@ break; case(`lpr): map<string, any> lpr = $[ "hostname" : UI::QueryWidget( `hostname, `Value ), - "queue" : UI::QueryWidget( `port, `Value ) + "queue" : UI::QueryWidget( `port_or_queue, `Value ) ]; if( size( lpr["hostname"]:"" ) > 0 && size( lpr["queue"]:"" ) > 0 @@ -978,80 +986,140 @@ } boolean testQueue( symbol selected ) -{ boolean test = true; - string host = (string)UI::QueryWidget( `hostname, `Value ); - integer ping_res = (integer)SCR::Execute( .target.bash, sformat( "ping -c 1 -w 5 %1", host ) ); - y2milestone( "ping %1 : %2", host, ping_res ); - if( ping_res != 0 ) - { Popup::Error(sformat(_("Host %1 unreachable!"), host)); - test = false; - return false; - } - string port = (string)UI::QueryWidget( `port, `Value ); - integer port_test = -1; - integer port_test_res = -1; +{ string test_command = ""; + string timeout = "5"; + string host = ""; + string port = ""; + string queue = ""; + string workgroup = ""; + string user = ""; + string password = ""; switch(selected) { case(`tcp): - port_test = (integer)SCR::Execute( .target.bash, sformat( "netcat -w 5 -z %1 %2 2>&1", host, port ) ); - y2internal( "Test port result : %1", port_test ); - if( port_test != 0 ) - { Popup::Error( sformat( "%1 %2", _("No connection possible to port"), port ) ); - test = false; + host = (string)UI::QueryWidget( `hostname, `Value ); + port = (string)UI::QueryWidget( `port_or_queue, `Value ); + test_command = sformat( "%1test_remote_socket \"%2\" \"%3\" %4", + Printerlib::yast_bin_dir, + host, + port, + timeout + ); + if( ! Printerlib::ExecuteBashCommand( test_command) ) + { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails + // where %1 will be replaced by the port number + // and %2 will be replaced by the host name: + _("Access test failed for port '%1' on host '%2'."), + port, + host + ), + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); return false; } - port_test_res = (integer)SCR::Execute( .target.bash, sformat( "echo -en \"\\r\" | netcat -w 5 %1 %2 2>&1", - host, - port - ) - ); - y2internal( "Test connection accept result : %1", port_test_res ); - if( port_test_res != 0 ) - { Popup::Error( sformat( "%1 %2 %3 %4 %5", _("Port"), port, _("on host"), host, _("doesn't accepts data") ) ); - test = false; - } - else - { Popup::Message( _("Test OK") ); - } break; case(`lpd): case(`lpr): - string queue = port; + host = (string)UI::QueryWidget( `hostname, `Value ); + queue = (string)UI::QueryWidget( `port_or_queue, `Value ); port = "515"; - port_test = (integer)SCR::Execute( .target.bash, sformat( "netcat -w 5 -z %1 %2 2>&1", host, port ) ); - y2internal( "Test port result : %1", port_test ); - if( port_test != 0 ) - { Popup::Error( sformat( "%1 %2", _("No connection possible to port"), port ) ); - test = false; + test_command = sformat( "%1test_remote_lpd \"%2\" \"%3\" %4", + Printerlib::yast_bin_dir, + host, + queue, + timeout + ); + if( ! Printerlib::ExecuteBashCommand( test_command) ) + { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails + // where %1 will be replaced by the queue name + // and %2 will be replaced by the host name: + _("Access test failed for queue '%1' on host '%2'."), + queue, + host + ), + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + return false; + } + break; + case(`cups): + host = (string)UI::QueryWidget( `hostname, `Value ); + queue = (string)UI::QueryWidget( `queue, `Value ); + test_command = sformat( "%1test_remote_ipp \"%2\" \"%3\" %4", + Printerlib::yast_bin_dir, + host, + queue, + timeout + ); + if( ! Printerlib::ExecuteBashCommand( test_command) ) + { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails + // where %1 will be replaced by the queue name + // and %2 will be replaced by the host name: + _("Access test failed for queue '%1' on host '%2'."), + queue, + host + ), + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); return false; } - map<string, any> available_port = (map<string, any>)SCR::Execute( .target.bash_output, "for I in 721 722 723 724 725 726 727 728 729 730 731; do fuser -n tcp $I &>/dev/null || { echo -n $I ; break ; } done" ); - y2milestone( "available port %1", available_port ); - map<string, any> test_lpd = (map<string, any>)SCR::Execute( .target.bash_output, sformat( " -TMP_IN=$(mktemp -u /tmp/lpd_test.in.XXXXXX) -TMP_OUT=$(mktemp -u /tmp/lpd_test.out.XXXXXX) -mkfifo $TMP_IN -mkfifo $TMP_OUT -netcat -w 1 -p %1 %2 %3 <$TMP_IN >$TMP_OUT 2>/dev/null & -NETCAT_PID=$! -{ sleep 5s ; kill $NETCAT_PID &>/dev/null ; } & -RESULT='' -{ echo -en \"\\002%4\\n\" ; \ - RESULT=$(head --bytes=1 <$TMP_OUT | tr '\\000' '0') ; \ - [ \"$RESULT\" = \"0\" ] && echo -en \"\\001\\n\" ; } >$TMP_IN -rm $TMP_IN -rm $TMP_OUT -exit $RESULT -", available_port["stdout"]:"", host, port, queue ) ); - if( test_lpd["exit"]:-1 == 0 ) - { Popup::Message( _("Test OK") ); + break; + case(`smb): + host = (string)UI::QueryWidget( `hostname, `Value ); + queue = (string)UI::QueryWidget( `printer, `Value ); + workgroup = (string)UI::QueryWidget( `domain, `Value ); + user = (string)UI::QueryWidget( `user, `Value ); + password = (string)UI::QueryWidget( `pass, `Value ); + test_command = sformat( "%1test_remote_smb \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" %7", + Printerlib::yast_bin_dir, + workgroup, + host, + queue, + user, + password, + timeout + ); + if( ! Printerlib::ExecuteBashCommand( test_command) ) + { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails + // where %1 will be replaced by the SMB share name + // and %2 will be replaced by the host name: + _("Access test failed for share '%1' on host '%2'."), + queue, + host + ), + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + return false; } - else - { Popup::Error( test_lpd["stderr"]:"" ); - test = false; + break; + case(`ipx): + host = (string)UI::QueryWidget( `hostname, `Value ); + queue = (string)UI::QueryWidget( `queue, `Value ); + user = (string)UI::QueryWidget( `user, `Value ); + password = (string)UI::QueryWidget( `pass, `Value ); + test_command = sformat( "%1test_remote_novell \"%2\" \"%3\" \"%4\" \"%5\" %6", + Printerlib::yast_bin_dir, + host, + queue, + user, + password, + timeout + ); + if( ! Printerlib::ExecuteBashCommand( test_command) ) + { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails + // where %1 will be replaced by the queue name + // and %2 will be replaced by the host name: + _("Access test failed for queue '%1' on host '%2'."), + queue, + host + ), + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + return false; } - break; + break; } - return test; + Popup::Message( _("Test OK") ); + return true; } boolean storeQueue( symbol selected ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/tools/Makefile.am new/yast2-printer-2.17.48/tools/Makefile.am --- old/yast2-printer-2.17.47/tools/Makefile.am 2008-11-26 16:44:53.000000000 +0100 +++ new/yast2-printer-2.17.48/tools/Makefile.am 2008-11-28 11:31:30.000000000 +0100 @@ -6,6 +6,12 @@ autodetect_print_queues \ determine_printer_driver_options \ modify_cupsd_conf \ - cups_client_only + cups_client_only \ + test_device \ + test_remote_ipp \ + test_remote_lpd \ + test_remote_novell \ + test_remote_smb \ + test_remote_socket EXTRA_DIST = $(ybin_SCRIPTS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/tools/Makefile.in new/yast2-printer-2.17.48/tools/Makefile.in --- old/yast2-printer-2.17.47/tools/Makefile.in 2008-11-27 14:29:53.000000000 +0100 +++ new/yast2-printer-2.17.48/tools/Makefile.in 2008-11-28 12:47:00.000000000 +0100 @@ -170,7 +170,13 @@ autodetect_print_queues \ determine_printer_driver_options \ modify_cupsd_conf \ - cups_client_only + cups_client_only \ + test_device \ + test_remote_ipp \ + test_remote_lpd \ + test_remote_novell \ + test_remote_smb \ + test_remote_socket EXTRA_DIST = $(ybin_SCRIPTS) all: all-am diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/tools/test_device new/yast2-printer-2.17.48/tools/test_device --- old/yast2-printer-2.17.47/tools/test_device 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-printer-2.17.48/tools/test_device 2008-11-28 12:55:59.000000000 +0100 @@ -0,0 +1,29 @@ +#! /bin/bash +# test_device sends a short message ($1) to device ($2). +# Timeout is set to $3 sec. +# Exits: 0 doesn't seem to have a problem +# 1 operation has timed out +# 2 problems while writing to $2 +# +# Jan Holesovsky <kendy(a)suse.cz>, 2000 +# Johannes Meixner <jsmeix(a)suse.de>, 2008 +# $Id: test_device 2928 2002-06-27 08:53:17Z jsrain $ + +#set -x + +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +EXITCODE=2 +trap "EXITCODE=0" 10 + +[ "$2" != "/dev/null" ] && fuser -k $2 # kill all processes using the device + +( sleep $3 ) & +SL=$! +( echo -en "$1" > $2 && kill -10 $$ ; kill $SL ) & +PR=$! +wait $SL && kill $PR && exit 1 # It cannot finish, it has timed out +exit $EXITCODE # How the prining finished? diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/tools/test_remote_ipp new/yast2-printer-2.17.48/tools/test_remote_ipp --- old/yast2-printer-2.17.47/tools/test_remote_ipp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-printer-2.17.48/tools/test_remote_ipp 2008-11-28 12:56:44.000000000 +0100 @@ -0,0 +1,55 @@ +#! /bin/bash +# +# Test ability to connect to remote IPP server. +# +# Exits: 0 doesn't seem to have a problem +# 1 remote host $1 or queue $2 not set +# 2 the remote host $1 is unreachable +# 3 no connection possible to port 631 on host $1 (no cups server running ?) +# 4 queue does not accept a print job (queue does not exist or queueing disabled ?) +# 10 ping not executable (no iputils RPM installed?) +# 11 netcat not executable (no netcat RPM installed?) +# (12=fuser,13=mktemp,14=sed: see listen_remote_ipp) +# 15 lp not executable (no cups-client RPM installed?) +# The program head is in the coreutils RPM and therefore assumed to exist. +# +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008 +# Jan Holesovsky <kendy(a)suse.cz>, 2000 +# Jiri Srain <jsrain(a)suse.cz>, 2002 +# $Id: test_remote_ipp 43943 2008-01-28 13:38:58Z mzugec $ + +#set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export PING=$( type -ap ping | head -n 1 ) +[ -z "$PING" ] && { echo -en "\nping not executable\n" 1>&2 ; exit 10 ; } +export NETCAT=$( type -ap netcat | head -n 1 ) +[ -z "$NETCAT" ] && { echo -en "\nnetcat not executable\n" 1>&2 ; exit 11 ; } +export LP=$( type -ap lp | head -n 1 ) +[ -z "$LP" ] && { echo -en "\nlp not executable\n" 1>&2 ; exit 15 ; } + +MY_NAME=${0##*/} +HOST="$1" +QUEUE="$2" +[ -z "$HOST" -o -z "$QUEUE" ] && { echo -en "\nUsage:\n$MY_NAME HOST QUEUE [TIMEOUT]\n" 1>&2 ; exit 1 ; } +TIMEOUT="$3" +[ -z "$TIMEOUT" ] && TIMEOUT=10 + +# test whether the remote host is accessible +$PING -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } + +# test whether connection is possible to port 631 (ipp) on the remote host +$NETCAT -w $TIMEOUT -z $HOST 631 || { echo -en "\nNo connection possible to port 631 (IPP) on host $HOST\n" ; exit 3 ; } + +# test whether the queue on the server accepts print jobs +echo -en "\r" | $LP -d $QUEUE -h $HOST 2>&1 +[ "$?" = "0" ] && { echo -en "\nQueue $QUEUE on host $HOST accepts print jobs\n" ; exit 0 ; } +echo -en "\nQueue $QUEUE on host $HOST does not accept print jobs\n" +exit 4 + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/tools/test_remote_lpd new/yast2-printer-2.17.48/tools/test_remote_lpd --- old/yast2-printer-2.17.47/tools/test_remote_lpd 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-printer-2.17.48/tools/test_remote_lpd 2008-11-28 12:56:58.000000000 +0100 @@ -0,0 +1,98 @@ +#! /bin/bash +# +# Send RFC1179 commands to the port 515 (lpd) on remote host $1 regarding queue $2 +# and test whether queue $2 on remote host $1 would accept print jobs. +# Remote host $1 and queue $2 are required parameters. +# If no timeout $3 is given it is set to 10 seconds. +# +# Exits: 0 doesn't seem to have a problem +# 1 remote host $1 or queue $2 not set +# 2 the remote host $1 is unreachable +# 3 no connection possible to port 515 on host $1 (no lpd running ?) +# 4 queue does not accept a print job (queue does not exist or queueing disabled ?) +# 10 ping not executable (no iputils RPM installed?) +# 11 netcat not executable (no netcat RPM installed?) +# 12 fuser not executable (no psmisc RPM installed?) +# 13 mktemp not executable (no mktemp RPM installed?) +# The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. +# +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008 +# Jan Holesovsky <kendy(a)suse.cz>, 2000 +# Jiri Srain <jsrain(a)suse.cz>, 2002 +# $Id: test_remote_lpd 43943 2008-01-28 13:38:58Z mzugec $ + +#set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export PING=$( type -ap ping | head -n 1 ) +[ -z "$PING" ] && { echo -en "\nping not executable\n" 1>&2 ; exit 10 ; } +export NETCAT=$( type -ap netcat | head -n 1 ) +[ -z "$NETCAT" ] && { echo -en "\nnetcat not executable\n" 1>&2 ; exit 11 ; } +export FUSER=$( type -ap fuser | head -n 1 ) +[ -z "$FUSER" ] && { echo -en "\nfuser not executable\n" 1>&2 ; exit 12 ; } +export MKTEMP=$( type -ap mktemp | head -n 1 ) +[ -z "$MKTEMP" ] && { echo -en "\nmktemp not executable\n" 1>&2 ; exit 13 ; } + +MY_NAME=${0##*/} +HOST="$1" +QUEUE="$2" +[ -z "$HOST" -o -z "$QUEUE" ] && { echo -en "\nUsage:\n$MY_NAME HOST QUEUE [TIMEOUT]\n" 1>&2 ; exit 1 ; } +TIMEOUT="$3" +[ -z "$TIMEOUT" ] && TIMEOUT=10 + +# test whether the remote host is accessible +$PING -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } + +# test whether connection is possible to port 515 (lpd) on the remote host +$NETCAT -w $TIMEOUT -z $HOST 515 || { echo -en "\nNo connection possible to port 515 (lpd)\n" ; exit 3 ; } + +# Find an available local port for connecting +PORT=$(for I in 721 722 723 724 725 726 727 728 729 730 731 + do + $FUSER -n tcp $I &>/dev/null || { echo $I ; break ; } + done) + +# Create temporary fifos +TMP_IN=$( $MKTEMP -u /tmp/$MY_NAME.in.XXXXXX ) +TMP_OUT=$( $MKTEMP -u /tmp/$MY_NAME.out.XXXXXX) +mkfifo $TMP_IN +mkfifo $TMP_OUT + +# Test the queue: +# Use source port $PORT and destination port 515 (LPD) +# "\002$QUEUE\n" is a request to receive a new job for $QUEUE +# The remote lpd sends '\000' if it accepts the request. Then we must +# send "\001\n" back which is a request to cancel the new job. +# After $TIMEOUT netcat would close the connection provided stdin of netcat +# was closed too which would happen if there is any response from the remote port. +# But as there may be no response from the remote port we have additionally +# a time bomb which would kill the netcat process after $TIMEOUT. + +$NETCAT -w $TIMEOUT -p $PORT $HOST 515 <$TMP_IN >$TMP_OUT 2>/dev/null & +NETCAT_PID=$! +{ sleep ${TIMEOUT}s ; kill $NETCAT_PID &>/dev/null ; } & + +RESULT="" +{ echo -en "\002$QUEUE\n" ; \ + RESULT=$( head --bytes=1 <$TMP_OUT | tr '\000' '0' ) ; \ + [ "$RESULT" = "0" ] && echo -en "\001\n" ; } >$TMP_IN + +rm $TMP_IN +rm $TMP_OUT + +[ "$RESULT" = "0" ] && { echo -en "\nQueue $QUEUE on host $HOST accepts print jobs\n" ; exit 0 ; } + +echo -en "\nQueue $QUEUE on host $HOST does not accept print jobs\n" + +# If $QUEUE does not accept jobs, print $QUEUE status in long format. +# "\004$QUEUE\n" is a request to receive $QUEUE status (very long output in case of LPRng). +echo -en "\nStatus of the queue $QUEUE\n" +echo -en "\004$QUEUE\n" | $NETCAT -w $TIMEOUT -p $PORT $HOST 515 +exit 4 + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/tools/test_remote_novell new/yast2-printer-2.17.48/tools/test_remote_novell --- old/yast2-printer-2.17.47/tools/test_remote_novell 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-printer-2.17.48/tools/test_remote_novell 2008-11-28 12:57:12.000000000 +0100 @@ -0,0 +1,43 @@ +#! /bin/bash +# +# Test ability to connect to remote IPX Novell server. +# +# Exits: 0 doesn't seem to have a problem +# 1 remote host $1 or queue $2 not set +# 4 queue does not accept a print job (queue does not exist or queueing disabled ?) +# (10=ping,11=netcat,12=fuser,13=mktemp,14=sed,15=lp,16=smbclient: see test_remote_smb) +# 17 nprint not executable (no ncpfs RPM installed?) +# +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008 +# Jan Holesovsky <kendy(a)suse.cz>, 2000 +# Jiri Srain <jsrain(a)suse.cz>, 2002 +# $Id: test_remote_novell 43943 2008-01-28 13:38:58Z mzugec $ + +#set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export NPRINT=$( type -ap nprint | head -n 1 ) +[ -z "$NPRINT" ] && { echo -en "\nnprint not executable\n" 1>&2 ; exit 17 ; } + +MY_NAME=${0##*/} +HOST=$1 +QUEUE=$2 +[ -z "$HOST" -o -z "$QUEUE" ] && { echo -en "\nUsage:\n$MY_NAME HOST QUEUE [TIMEOUT]\n" 1>&2 ; exit 1 ; } +USER=$3 +PASSWORD=$4 +TIMEOUT="$5" + +[ -z "$TIMEOUT" ] && TIMEOUT=10 + +# test whether the queue on the server accepts print jobs +echo -en "\r" | $NPRINT -S "$HOST" -U "$USER" -P "$PASSWORD" -q "$QUEUE" - 2>&1 +[ "$?" = "0" ] && { echo -en "\nQueue $QUEUE on host $HOST accepts print jobs\n" ; exit 0 ; } +echo -en "\nQueue $QUEUE on host $HOST does not accept print jobs\n" +exit 4 + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/tools/test_remote_smb new/yast2-printer-2.17.48/tools/test_remote_smb --- old/yast2-printer-2.17.47/tools/test_remote_smb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-printer-2.17.48/tools/test_remote_smb 2008-11-28 12:57:25.000000000 +0100 @@ -0,0 +1,54 @@ +#! /bin/bash +# +# Test ability to connect to remote SMB server. +# +# Exits: 0 doesn't seem to have a problem +# 1 remote host $1 or queue $2 not set +# 2 the remote host $1 is unreachable +# 4 queue does not accept a print job (queue does not exist or queueing disabled ?) +# 10 ping not executable (no iputils RPM installed?) +# (11=netcat,12=fuser,13=mktemp,14=sed,15=lp: see test_remote_ipp) +# 16 smbclient not executable (no samba-client RPM installed?) +# The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. +# +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008 +# Jan Holesovsky <kendy(a)suse.cz>, 2000 +# Jiri Srain <jsrain(a)suse.cz>, 2002 +# $Id: test_remote_smb 43943 2008-01-28 13:38:58Z mzugec $ + +#set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export PING=$( type -ap ping | head -n 1 ) +[ -z "$PING" ] && { echo -en "\nping not executable\n" 1>&2 ; exit 10 ; } +export SMBCLIENT=$( type -ap smbclient | head -n 1 ) +[ -z "$SMBCLIENT" ] && { echo -en "\nsmbclient not executable\n" 1>&2 ; exit 16 ; } + +MY_NAME=${0##*/} +WORKGROUP=$1 +HOST=$2 +QUEUE=$3 +[ -z "$HOST" -o -z "$QUEUE" ] && { echo -en "\nUsage:\n$MY_NAME WORKGROUP HOST QUEUE [USER] [PASS] [TIMEOUT]\n" 1>&2 ; exit 1 ; } +USER=$4 +PASSWORD=$5 +TIMEOUT="$6" + +[ -z "$TIMEOUT" ] && TIMEOUT=10 + +# test whether the remote host is accessible +$PING -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } + +# test whether the queue on the server accepts print jobs +echo -e "\nTesting $QUEUE on $WORKGROUP/$HOST:" +test -z $PASSWORD && PASSWORD="-N" +echo -en "\r" | $SMBCLIENT "//$HOST/$QUEUE" "$PASSWORD" -c "print -" -U "$USER" -W "$WORKGROUP" +[ "$?" = "0" ] && { echo -en "\nShare $QUEUE on $WORKGROUP/$HOST accepts print jobs\n" ; exit 0 ; } +echo -en "\nShare $QUEUE on $WORKGROUP/$HOST does not accept print jobs\n" +exit 4 + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/tools/test_remote_socket new/yast2-printer-2.17.48/tools/test_remote_socket --- old/yast2-printer-2.17.47/tools/test_remote_socket 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-printer-2.17.48/tools/test_remote_socket 2008-11-28 12:57:35.000000000 +0100 @@ -0,0 +1,51 @@ +#! /bin/bash +# +# Test ability to connect to remote direct socket (JetDirect) server. +# +# Exits: 0 doesn't seem to have a problem +# 1 remote host $1 not set +# 2 the remote host $1 is unreachable +# 3 no connection possible to port 9100 or port $2 on host $1 +# 4 port 9100 or port $2 on host $1 does not accept data +# 10 ping not executable (no iputils RPM installed?) +# 11 netcat not executable (no netcat RPM installed?) +# The program head is in the coreutils RPM and therefore assumed to exist. +# +# Johannes Meixner <jsmeix(a)suse.de> 2002, 2007, 2008 +# Jiri Srain <jsrain(a)suse.cz>, 2002 +# $Id: test_remote_socket 43943 2008-01-28 13:38:58Z mzugec $ + +#set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export PING=$( type -ap ping | head -n 1 ) +[ -z "$PING" ] && { echo -en "\nping not executable\n" 1>&2 ; exit 10 ; } +export NETCAT=$( type -ap netcat | head -n 1 ) +[ -z "$NETCAT" ] && { echo -en "\nnetcat not executable\n" 1>&2 ; exit 11 ; } + +MY_NAME=${0##*/} +HOST="$1" +[ -z "$HOST" ] && { echo -en "\nUsage:\n$MY_NAME HOST [PORT [TIMEOUT]]\n" 1>&2 ; exit 1 ; } +PORT="$2" +[ -z "$PORT" ] && PORT=9100 +TIMEOUT="$3" +[ -z "$TIMEOUT" ] && TIMEOUT=10 + +# test whether the remote host is accessible +$PING -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } + +# test whether connection is possible to $PORT on the remote host +$NETCAT -w $TIMEOUT -z $HOST $PORT || { echo -en "\nNo connection possible to port $PORT\n" ; exit 3 ; } + +# test whether $PORT on the remote host accepts data +echo -en "\r" | $NETCAT -w $TIMEOUT $HOST $PORT 2>&1 +[ "$?" = "0" ] && { echo -en "\nPort $PORT on host $HOST accepts data\n" ; exit 0 ; } +echo -en "\nPort $PORT on host $HOST does not accept data\n" +exit 4 + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.47/VERSION new/yast2-printer-2.17.48/VERSION --- old/yast2-printer-2.17.47/VERSION 2008-11-27 14:05:33.000000000 +0100 +++ new/yast2-printer-2.17.48/VERSION 2008-11-28 12:37:15.000000000 +0100 @@ -1 +1 @@ -2.17.47 +2.17.48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-packager checked in at Fri Nov 28 16:14:09 CET 2008. -------- --- yast2-packager/yast2-packager.changes 2008-11-26 13:56:14.000000000 +0100 +++ yast2-packager/yast2-packager.changes 2008-11-28 12:19:05.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 28 12:17:59 CET 2008 - locilka(a)suse.cz + +- DefaultDesktop module now returns desktop name translated using + the current language (bnc #449818). +- 2.17.49 + +------------------------------------------------------------------- +Thu Nov 27 18:19:26 CET 2008 - locilka(a)suse.cz + +- Downloading slides only once (bnc #444612). +- Do not reset/open the slide show in inst_rpmcopy when slide show + dialog is already available/in use (bnc #443755). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.17.48.tar.bz2 New: ---- yast2-packager-2.17.49.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.Aj9908/_old 2008-11-28 16:11:06.000000000 +0100 +++ /var/tmp/diff_new_pack.Aj9908/_new 2008-11-28 16:11:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.17.48) +# spec file for package yast2-packager (Version 2.17.49) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-packager -Version: 2.17.48 +Version: 2.17.49 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.17.48.tar.bz2 +Source0: yast2-packager-2.17.49.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml # HTTP.ycp @@ -78,7 +78,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.17.48 +%setup -n yast2-packager-2.17.49 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +114,14 @@ %{prefix}/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Fri Nov 28 2008 locilka(a)suse.cz +- DefaultDesktop module now returns desktop name translated using + the current language (bnc #449818). +- 2.17.49 +* Thu Nov 27 2008 locilka(a)suse.cz +- Downloading slides only once (bnc #444612). +- Do not reset/open the slide show in inst_rpmcopy when slide show + dialog is already available/in use (bnc #443755). * Wed Nov 26 2008 locilka(a)suse.cz - Using <pre> in ProductLicense (bnc #449188). - 2.17.48 ++++++ yast2-packager-2.17.48.tar.bz2 -> yast2-packager-2.17.49.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.48/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.17.49/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.17.48/src/clients/inst_rpmcopy.ycp 2008-09-26 12:03:29.000000000 +0200 +++ new/yast2-packager-2.17.49/src/clients/inst_rpmcopy.ycp 2008-11-27 18:30:28.000000000 +0100 @@ -13,7 +13,7 @@ * Packages module : * "installed" * - * $Id: inst_rpmcopy.ycp 51562 2008-09-26 08:21:54Z lslezak $ + * $Id: inst_rpmcopy.ycp 53672 2008-11-27 17:31:12Z locilka $ */ { @@ -419,7 +419,14 @@ // we want the table SlideShow::ShowTable(); - SlideShow::OpenDialog(); + // Do not open a new SlideShow widget, reuse the old one instead + boolean required_to_open_sl_dialog = (! SlideShow::HaveSlideWidget()); + + // BNC #443755 + if (required_to_open_sl_dialog) { + y2milestone ("SlideShow dialog not yet created"); + SlideShow::OpenDialog(); + } // move the progress to the packages stage SlideShow::MoveToStage("packages"); @@ -434,7 +441,11 @@ Pkg::PkgCommit (9999); } - SlideShow::CloseDialog(); + // BNC #443755 + if (required_to_open_sl_dialog) { + y2milestone ("Closing previously opened SlideShow dialog"); + SlideShow::CloseDialog(); + } if (result != `abort) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.48/src/modules/DefaultDesktop.ycp new/yast2-packager-2.17.49/src/modules/DefaultDesktop.ycp --- old/yast2-packager-2.17.48/src/modules/DefaultDesktop.ycp 2008-11-20 16:44:07.000000000 +0100 +++ new/yast2-packager-2.17.49/src/modules/DefaultDesktop.ycp 2008-11-27 19:40:38.000000000 +0100 @@ -87,6 +87,8 @@ return; } + string desktop_label = (string) one_desktop_cf["label_id"]:MissingKey (one_desktop_cf, "label_id"); + // required keys one_desktop = $[ "desktop" : one_desktop_cf["desktop"]:MissingKey (one_desktop_cf, "desktop"), @@ -95,7 +97,9 @@ "packages" : splitstring (one_desktop_cf["packages"]:"", " \t\n"), "patterns" : splitstring (one_desktop_cf["patterns"]:"", " \t\n"), "order" : one_desktop_cf["order"]:MissingKey (one_desktop_cf, "order"), - "label" : ProductControl::GetTranslatedText ((string) one_desktop_cf["label_id"]:MissingKey (one_desktop_cf, "label_id")), + // BNC #449818, after switching the language name should change too + "label_id" : desktop_label, + "label" : ProductControl::GetTranslatedText (desktop_label), ]; // 'icon' in optional @@ -105,7 +109,11 @@ // 'description' is optional if (haskey (one_desktop_cf, "description_id")) { - one_desktop["description"] = ProductControl::GetTranslatedText ((string) one_desktop_cf["description_id"]:""); + string description_id = (string) one_desktop_cf["description_id"]:""; + + one_desktop["description"] = ProductControl::GetTranslatedText (description_id); + // BNC #449818, after switching the language description should change too + one_desktop["description_id"] = description_id; } // bnc #431251 @@ -144,8 +152,10 @@ * "desktop ID" : $[ * "desktop" : "desktop to start", // DEFAULT_WM * "order" : integer, - * "label" : _("Desktop Name Visible in Dialog"), - * "description" : _("Description text of the desktop"), + * "label" : _("Desktop Name Visible in Dialog (localized - initial localization)"), + * "label_id" : _("Desktop Name Visible in Dialog (original)"), + * "description" : _("Description text of the desktop (localized - initial localization)"), + * "description_id" : _("Description text of the desktop (originale)"), * "patterns" : ["list", "of", "related", "patterns"], * "icon" : "some-icon", // filename from the 64x64 directory of the current theme (without .png suffix) * ], @@ -298,7 +308,7 @@ global string Description () { Init(); - return all_desktops[desktop, "label"]:""; + return ProductControl::GetTranslatedText (all_desktops[desktop, "label_id"]:""); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.48/src/modules/Packages.ycp new/yast2-packager-2.17.49/src/modules/Packages.ycp --- old/yast2-packager-2.17.48/src/modules/Packages.ycp 2008-11-24 12:25:20.000000000 +0100 +++ new/yast2-packager-2.17.49/src/modules/Packages.ycp 2008-11-27 18:30:28.000000000 +0100 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 53529 2008-11-21 16:23:33Z lslezak $ + * $Id: Packages.ycp 53672 2008-11-27 17:31:12Z locilka $ */ { @@ -1163,6 +1163,13 @@ Init (true); } + // Do not reinitialize the SlideShow if not needed + // bnc #444612 + if (size (SlideShow::GetSetup()) > 0) { + y2milestone ("SlideShow has been already set, skipping..."); + return; + } + integer source = base_source_id; string lang_long = ""; @@ -1207,6 +1214,9 @@ // no images are cached string search_for_dir = sformat ("/%1/setup/slide/", datadir); FindAndCopySlideDirWithoutCallbacks(our_slidedir, source, search_for_dir, lang_long, lang_short, Slides::fallback_lang); + // Language has to be set otherwise it uses a fallback language + // BNC #444612 comment #2 + SlideShow::SetLanguage (Language::language); // fallback solution disabled /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.48/VERSION new/yast2-packager-2.17.49/VERSION --- old/yast2-packager-2.17.48/VERSION 2008-11-26 13:56:19.000000000 +0100 +++ new/yast2-packager-2.17.49/VERSION 2008-11-27 18:23:11.000000000 +0100 @@ -1 +1 @@ -2.17.48 +2.17.49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-installation checked in at Fri Nov 28 16:12:19 CET 2008. -------- --- yast2-installation/yast2-installation.changes 2008-11-28 12:04:52.000000000 +0100 +++ yast2-installation/yast2-installation.changes 2008-11-28 12:16:49.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Nov 28 12:16:03 CET 2008 - locilka(a)suse.cz + +- Fixed behavior of inst_new_desktop when user switched to another + language later (bnc #449818). +- 2.17.42 + +------------------------------------------------------------------- +Thu Nov 27 16:49:11 CET 2008 - locilka(a)suse.cz + +- Using yast-live-install-finish icon when finishing LiveCD + installation/inst_finish (bnc #438154). +- Fixed ImageInstallation SlideShow - download progress is shown + only when downloading the images, not the other helper files + (bnc #449792). +- Adjusting ImageInstallation-related SlideShow only if + ImageInstallation is in use (bnc #439104). + +------------------------------------------------------------------- @@ -4 +22 @@ -- the real fix for bnc #442691 +- the real fix for #442691 calling whatdependson for head-i586 Old: ---- yast2-installation-2.17.41.tar.bz2 New: ---- yast2-installation-2.17.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.vv9602/_old 2008-11-28 16:10:58.000000000 +0100 +++ /var/tmp/diff_new_pack.vv9602/_new 2008-11-28 16:10:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.17.41) +# spec file for package yast2-installation (Version 2.17.42) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-installation -Version: 2.17.41 +Version: 2.17.42 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.17.41.tar.bz2 +Source0: yast2-installation-2.17.42.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # PackageCallbacks::RegisterEmptyProgressCallbacks() @@ -45,8 +45,8 @@ Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() Conflicts: yast2-pkg-bindings < 2.17.25 -# ProductLicense::AcceptanceNeeded, BNC #448598 -Requires: yast2-packager >= 2.17.46 +# BNC #449818: "description_id" in DefaultDesktop +Requires: yast2-packager >= 2.17.49 # Storage::GetCommitInfo() call in include/misc.ycp Requires: yast2-storage >= 2.17.47 # Only in inst-sys @@ -120,7 +120,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.17.41 +%setup -n yast2-installation-2.17.42 %build %{prefix}/bin/y2tool y2autoconf @@ -189,8 +189,20 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Fri Nov 28 2008 locilka(a)suse.cz +- Fixed behavior of inst_new_desktop when user switched to another + language later (bnc #449818). +- 2.17.42 +* Thu Nov 27 2008 locilka(a)suse.cz +- Using yast-live-install-finish icon when finishing LiveCD + installation/inst_finish (bnc #438154). +- Fixed ImageInstallation SlideShow - download progress is shown + only when downloading the images, not the other helper files + (bnc #449792). +- Adjusting ImageInstallation-related SlideShow only if + ImageInstallation is in use (bnc #439104). * Thu Nov 27 2008 ug(a)suse.de -- the real fix for bnc #442691 +- the real fix for #442691 deploy_image_auto doesn't use the boolean variable image_installation - 2.17.41 ++++++ yast2-installation-2.17.41.tar.bz2 -> yast2-installation-2.17.42.tar.bz2 ++++++ ++++ 3300 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-installation-2.17.41/configure.in new/yast2-installation-2.17.42/configure.in --- old/yast2-installation-2.17.41/configure.in 2008-11-27 15:13:18.000000000 +0100 +++ new/yast2-installation-2.17.42/configure.in 2008-11-25 16:33:54.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.17.41, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.17.40, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.41" +VERSION="2.17.40" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(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-installation-2.17.41/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.17.42/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.17.41/src/clients/inst_complex_welcome.ycp 2008-11-25 17:09:35.000000000 +0100 +++ new/yast2-installation-2.17.42/src/clients/inst_complex_welcome.ycp 2008-11-25 16:57:09.000000000 +0100 @@ -218,7 +218,12 @@ void ReadCurrentUIState () { language = (string) UI::QueryWidget (`id (`language), `Value); keyboard = (string) UI::QueryWidget (`id (`keyboard), `Value); - license_acc = (boolean) UI::QueryWidget (`id (`license_agreement), `Value); + + if (ProductLicense::AcceptanceNeeded()) { + license_acc = (boolean) UI::QueryWidget (`id (`license_agreement), `Value); + } else { + license_acc = true; + } } // Returns true if the dialog needs redrawing 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-installation-2.17.41/src/clients/inst_deploy_image.ycp new/yast2-installation-2.17.42/src/clients/inst_deploy_image.ycp --- old/yast2-installation-2.17.41/src/clients/inst_deploy_image.ycp 2008-11-13 14:59:38.000000000 +0100 +++ new/yast2-installation-2.17.42/src/clients/inst_deploy_image.ycp 2008-11-27 16:59:08.000000000 +0100 @@ -62,7 +62,7 @@ // div by zero! if (_current_subprogress_total == 0) { y2error ("steps_total=0"); - _current_subprogress_total = 100; + _current_subprogress_total = 1; } y2milestone ( @@ -91,6 +91,7 @@ SetProgress(); } + // Should be 0 - 100% _current_overall_progress = _current_subprogress_start + (_current_subprogress_steps * _current_step_in_subprogress / _current_subprogress_total); @@ -104,10 +105,38 @@ integer _steps_for_one_image = 100; boolean download_handler_hit = false; string _last_image_downloading = nil; +boolean report_image_downloading = false; + +// Not only images but also some helper files are downloaded +// Image installation should report only images +// BNC #449792 +void MyStartDownloadHandler (string url, string localfile) { + map <string, any> current_image = ImageInstallation::GetCurrentImageDetails(); + string current_image_file = current_image["file"]:""; + + // Fetches is (additionally) downloading some other file + if (current_image_file == nil || current_image_file == "") { + y2warning ("Uknown image being downloaded: %1", current_image); + report_image_downloading = false; + return; + } + + integer image_filename_length = size (current_image_file); + // 'http://some.url/directory/image.name' vs. 'directory/image.name' + string image_url_download = substring (url, size (url) - image_filename_length, image_filename_length); + + // downloading progress is reported only if + report_image_downloading = (image_url_download == current_image_file); + + y2milestone ("Downloading started %1, showing progress %2", url, report_image_downloading); +} boolean MyProgressDownloadHandler (integer percent, integer bps_avg, integer bps_current) { // changing settings on the fly // ... first when download handler is hit + // + // if a repository is remote, there are twice more steps to do (download, deploy) + // local (or NFS, SMB, ...) access do not use downloader if (! download_handler_hit) { y2milestone ("DownloadHandler - first hit"); // twice more steps @@ -115,6 +144,12 @@ download_handler_hit = true; } + // See MyStartDownloadHandler + // BNC #449792 + if (report_image_downloading != true) { + return true; + } + map <string, any> current_image = ImageInstallation::GetCurrentImageDetails(); if (_last_download_progress < percent) { @@ -127,6 +162,7 @@ _last_image_downloading = image_info; } + // unknown image if (image_info == "") { image_info = sformat (_("Downloading image at speed %1/s"), String::FormatSize (bps_current)); } else { @@ -223,6 +259,7 @@ ImageInstallation::SetDeployTarImageProgress (SetOneImageProgress); ImageInstallation::SetDownloadTarImageProgress (MyProgressDownloadHandler); +ImageInstallation::SetStartDownloadImageProgress (MyStartDownloadHandler); ImageInstallation::SetOverallDeployingProgress (OverallProgressHandler); ImageInstallation::AdjustProgressLayout ("deploying_images", (_steps_for_one_image * size (images)), _("Deploying Images...")); 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-installation-2.17.41/src/clients/inst_finish.ycp new/yast2-installation-2.17.42/src/clients/inst_finish.ycp --- old/yast2-installation-2.17.41/src/clients/inst_finish.ycp 2008-10-27 17:08:56.000000000 +0100 +++ new/yast2-installation-2.17.42/src/clients/inst_finish.ycp 2008-11-27 17:00:04.000000000 +0100 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin(a)suse.de> * Jiri Srain <jsrain(a)suse.de> * - * $Id: inst_finish.ycp 52601 2008-10-27 15:24:59Z locilka $ + * $Id: inst_finish.ycp 53663 2008-11-27 16:00:48Z locilka $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot @@ -149,7 +149,8 @@ "copy_logs", "umount", ], - "icon" : "yast-scripts", + // bnc #438154 + "icon" : (Mode::live_installation() ? "yast-live-install-finish":"yast-scripts"), ], ]; 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-installation-2.17.41/src/clients/inst_new_desktop.ycp new/yast2-installation-2.17.42/src/clients/inst_new_desktop.ycp --- old/yast2-installation-2.17.41/src/clients/inst_new_desktop.ycp 2008-10-09 12:16:30.000000000 +0200 +++ new/yast2-installation-2.17.42/src/clients/inst_new_desktop.ycp 2008-11-28 11:05:25.000000000 +0100 @@ -120,13 +120,15 @@ `Left (`RadioButton ( `id (GetDesktopRadioButtonId (desktop_name)), radio_opt, - all_desktops[desktop_name,"label"]:"" + // BNC #449818 + ProductControl::GetTranslatedText (all_desktops[desktop_name,"label_id"]:"") )), (desktops == "major" && show_descr ? `ReplacePoint (`id (GetDesktopDescriptionId (desktop_name)), `HBox ( `HSpacing ((text_mode ? 4:2)), - `Left (`Label (all_desktops[desktop_name,"description"]:"")), + // BNC #449818 + `Left (`Label (ProductControl::GetTranslatedText (all_desktops[desktop_name,"description_id"]:""))), `HSpacing (1) )) : 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-installation-2.17.41/src/clients/inst_prepareprogress.ycp new/yast2-installation-2.17.42/src/clients/inst_prepareprogress.ycp --- old/yast2-installation-2.17.41/src/clients/inst_prepareprogress.ycp 2008-09-11 11:49:51.000000000 +0200 +++ new/yast2-installation-2.17.42/src/clients/inst_prepareprogress.ycp 2008-11-26 18:40:30.000000000 +0100 @@ -27,7 +27,11 @@ SlideShow::OpenDialog(); PackageSlideShow::InitPkgData(true); // FIXME: this is odd! - ImageInstallation::FillUpImagesDetails(); + // Details (such as images sizes) have to known before initializing the SlideShow + // but only if Installation from Images is in use + if (Installation::image_installation) { + ImageInstallation::FillUpImagesDetails(); + } list< map<string,any> > stages = [ $[ @@ -39,7 +43,9 @@ $[ "name" : "images", "description": _("Deploying Images..."), - "value" : ImageInstallation::TotalSize() / 1024, // kilobytes + // Use 'zero' if image installation is not used + // BNC #439104 + "value" : (Installation::image_installation ? ImageInstallation::TotalSize() / 1024 : 0), // kilobytes "units" : `kb, ], $[ 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-installation-2.17.41/src/modules/ImageInstallation.ycp new/yast2-installation-2.17.42/src/modules/ImageInstallation.ycp --- old/yast2-installation-2.17.41/src/modules/ImageInstallation.ycp 2008-11-11 11:04:43.000000000 +0100 +++ new/yast2-installation-2.17.42/src/modules/ImageInstallation.ycp 2008-11-27 16:53:06.000000000 +0100 @@ -28,6 +28,7 @@ import "SlideShow"; import "ProductControl"; import "ProductFeatures"; +import "Packages"; textdomain "installation"; @@ -37,6 +38,25 @@ integer _repo = nil; /** + * Set the repository to get images from + * @param repo integer the repository identification + */ +global void SetRepo (integer repo) { + _repo = repo; + y2milestone ("New images repo: %1", _repo); +} + +/** + * Adjusts the repository for images + */ +void InitRepo () { + if (_repo != nil) + return; + + SetRepo (Packages::theSources[0]:0); +} + +/** * Description of all available images */ map<string,map<string,any> > _images = $[]; @@ -104,14 +124,6 @@ } /** - * Set the repository to get images from - * @param repo integer the repository identification - */ -global void SetRepo (integer repo) { - _repo = repo; -} - -/** * Name of image containing software management metadata (if exists) * @return string image with sw mgmt metadata */ @@ -190,6 +202,14 @@ y2milestone ("New download_image_progress: %1", download_image_progress); } +void (string, string) start_download_handler = nil; + +// BNC #449792 +global void SetStartDownloadImageProgress (void (string, string) sdi) { + start_download_handler = sdi; + y2milestone ("New start_download_handler: %1", start_download_handler); +} + void (string, integer) generic_set_progress = nil; global void SetOverallDeployingProgress (void (string, integer) odp) { @@ -204,6 +224,8 @@ * @return boolean true on success */ boolean DeployTarImage (string id, string target) { + InitRepo(); + string file = _images[id, "file"]:""; y2milestone ("Untarring image %1 (%2) to %3", id, file, target); file = sformat ("%1/%2", _image_path, file); @@ -306,6 +328,8 @@ * @return boolean true on success */ boolean DeployFsImage (string id, string target) { + InitRepo(); + string file = _images[id, "file"]:""; y2milestone ("Deploying FS image %1 (%2) on %3", id, file, target); file = sformat ("%1/%2", _image_path, file); @@ -359,6 +383,8 @@ * @return boolean true on success */ boolean MountFsImage (string id, string target) { + InitRepo(); + string file = _images[id, "file"]:""; y2milestone ("Mounting image %1 (%2) on %3", id, file, target); file = sformat ("%1/%2", _image_path, file); @@ -390,7 +416,9 @@ y2milestone( "Computing total images size from [%1], data %2", _image_order, images_details ); foreach( string image, _image_order, { - sum = sum + images_details[image,"size"]:0; + // 128 MB as a fallback size + // otherwise progress would not move at all + sum = sum + images_details[image,"size"]:134217728; }); y2milestone( "Total images size: %1", sum ); @@ -493,6 +521,14 @@ * Loads non-mandatory details for every single selected image. */ global boolean FillUpImagesDetails () { + InitRepo(); + + // bnc #439104 + if (_repo == nil) { + y2warning ("No images-repository defined"); + return true; + } + // ppc (covers also ppc64), i386, x86_64 ... string filename = nil; @@ -507,7 +543,7 @@ filename = Pkg::SourceProvideDigestedFile (_repo, 1, try_file, true); if (filename != nil && filename != "") { - y2milestone ("Using file: %1 (%2)", filename, try_file); + y2milestone ("Using details file: %1 (%2)", filename, try_file); break; } }); @@ -566,6 +602,10 @@ if (download_image_progress != nil) Pkg::CallbackProgressDownload (download_image_progress); + // register own callback for start downloading + if (start_download_handler != nil) + Pkg::CallbackStartDownload (start_download_handler); + integer num = -1; _current_image_from_imageset = -1; boolean aborted = nil; @@ -632,6 +672,8 @@ * @return boolean true on success or when media does not contain any images */ global boolean FindImageSet (list<string> patterns) { + InitRepo(); + // reset all data _images = $[]; _image_order = []; 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-installation-2.17.41/VERSION new/yast2-installation-2.17.42/VERSION --- old/yast2-installation-2.17.41/VERSION 2008-11-27 15:13:14.000000000 +0100 +++ new/yast2-installation-2.17.42/VERSION 2008-11-28 12:16:55.000000000 +0100 @@ -1 +1 @@ -2.17.41 +2.17.42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-country
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-country checked in at Fri Nov 28 16:10:55 CET 2008. -------- --- yast2-country/yast2-country.changes 2008-11-25 09:55:41.000000000 +0100 +++ yast2-country/yast2-country.changes 2008-11-28 12:52:47.925476000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 28 12:44:25 CET 2008 - jsuchome(a)suse.cz + +- help text: do not refer to hidden parts (bnc#449070) +- 2.17.29 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.17.28.tar.bz2 New: ---- yast2-country-2.17.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.er8283/_old 2008-11-28 16:10:32.000000000 +0100 +++ /var/tmp/diff_new_pack.er8283/_new 2008-11-28 16:10:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.17.28) +# spec file for package yast2-country (Version 2.17.29) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-country -Version: 2.17.28 +Version: 2.17.29 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.17.28.tar.bz2 +Source0: yast2-country-2.17.29.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2-trans-stats yast2-perl-bindings timezone @@ -75,7 +75,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-country-2.17.28 +%setup -n yast2-country-2.17.29 %build %{prefix}/bin/y2tool y2autoconf @@ -143,6 +143,9 @@ /usr/share/YaST2/data/languages/*.ycp /usr/share/YaST2/modules/Language.y* %changelog +* Fri Nov 28 2008 jsuchome(a)suse.cz +- help text: do not refer to hidden parts (bnc#449070) +- 2.17.29 * Tue Nov 25 2008 jsuchome(a)suse.cz - more space around time widgets so the French button can fit (bnc#446460) ++++++ yast2-country-2.17.28.tar.bz2 -> yast2-country-2.17.29.tar.bz2 ++++++ ++++ 7021 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-country-2.17.28/language/src/select_language.ycp new/yast2-country-2.17.29/language/src/select_language.ycp --- old/yast2-country-2.17.28/language/src/select_language.ycp 2008-10-02 09:58:50.000000000 +0200 +++ new/yast2-country-2.17.29/language/src/select_language.ycp 2008-11-28 12:43:15.000000000 +0100 @@ -396,12 +396,15 @@ Choose the new Primary Language for your system. \n"); - // help text for 'adapt keyboard checkbox' - help_text = help_text + _(" + if (adapt_term) + { + // help text for 'adapt keyboard checkbox' + help_text = help_text + _(" Check Adapt Keyboard Layout to change the keyboard layout to the primary language. Check Adapt Time Zone to change the current time zone according to the primary language. If the keyboard layout or time zone is already adapted to the default language setting, the respective option is disabled. "); + } // help text when "multiple languages" are suported 2/2 help_text = help_text + _(" 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-country-2.17.28/timezone/src/dialogs.ycp new/yast2-country-2.17.29/timezone/src/dialogs.ycp --- old/yast2-country-2.17.28/timezone/src/dialogs.ycp 2008-11-25 09:37:12.000000000 +0100 +++ new/yast2-country-2.17.29/timezone/src/dialogs.ycp 2008-11-25 09:55:56.000000000 +0100 @@ -11,7 +11,7 @@ * Summary: * Dialogs for timeone and time configuration. * - * $Id: dialogs.ycp 53383 2008-11-18 14:54:54Z jsuchome $ + * $Id: dialogs.ycp 53563 2008-11-25 08:55:55Z jsuchome $ */ { textdomain "country"; 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-country-2.17.28/VERSION new/yast2-country-2.17.29/VERSION --- old/yast2-country-2.17.28/VERSION 2008-11-25 09:37:58.000000000 +0100 +++ new/yast2-country-2.17.29/VERSION 2008-11-28 12:45:04.000000000 +0100 @@ -1 +1 @@ -2.17.28 +2.17.29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package xorg-x11-server checked in at Fri Nov 28 16:10:45 CET 2008. -------- --- xorg-x11-server/xorg-x11-server.changes 2008-11-21 20:17:13.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2008-11-28 03:57:17.837049316 +0100 @@ -1,0 +2,16 @@ +Fri Nov 28 03:56:16 CET 2008 - sndirsch(a)suse.de + +- dpms_screensaver.diff + * DMPS calls dixSaveScreens() when turned on but not when turned + off. In most cases this is irrelevant as DPMS is done when a + key is hit in which case dixSaveScreens() will be called to + unblank anyhow. This isn't the case if we use xset (or the + DPMS extension directly) to unblank. (bnc #439495) + +------------------------------------------------------------------- +Wed Nov 26 14:35:30 CET 2008 - sndirsch(a)suse.de + +- rename "i810" driver entry in xorg.conf to "intel" during update + (bnc #448458) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dpms_screensaver.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.tQ5891/_old 2008-11-28 16:09:40.000000000 +0100 +++ /var/tmp/diff_new_pack.tQ5891/_new 2008-11-28 16:09:40.000000000 +0100 @@ -29,7 +29,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 16 +Release: 17 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -104,6 +104,7 @@ Patch124: commit-59f9fb4b8.diff Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch Patch126: commit-a9e2030.diff +Patch127: dpms_screensaver.diff %description This package contains the X.Org Server. @@ -223,6 +224,7 @@ %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 %build pushd xorg-docs-* @@ -395,6 +397,7 @@ if [ -f etc/X11/xorg.conf ]; then # SuSE 10.1 --> SuSE 10.2: X11 fonts have moved to /usr/share/fonts # SuSE 10.1 --> SuSE 10.2: radeonold --> radeon + # openSUSE 11.0 --> openSUSE 11.1: i810 --> intel (Bug #448458) if grep -q -e /usr/X11R6/lib/X11/fonts/ \ -e /usr/X11/lib/X11/fonts/ \ -e /usr/lib/X11/fonts/ \ @@ -412,6 +415,10 @@ etc/X11/xorg.conf fi fi + if grep -q \"i810\" etc/X11/xorg.conf; then + sed -i.post_xorg-x11-server -e 's/\"i810\"/\"intel\"/g' \ + etc/X11/xorg.conf + fi fi %endif # Installation of init script seems to be disabled by default @@ -539,6 +546,16 @@ %endif %changelog +* Fri Nov 28 2008 sndirsch(a)suse.de +- dpms_screensaver.diff + * DMPS calls dixSaveScreens() when turned on but not when turned + off. In most cases this is irrelevant as DPMS is done when a + key is hit in which case dixSaveScreens() will be called to + unblank anyhow. This isn't the case if we use xset (or the + DPMS extension directly) to unblank. (bnc #439495) +* Wed Nov 26 2008 sndirsch(a)suse.de +- rename "i810" driver entry in xorg.conf to "intel" during update + (bnc #448458) * Fri Nov 21 2008 sndirsch(a)suse.de - commit-a9e2030.diff * int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ++++++ dpms_screensaver.diff ++++++ diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 5ee5e24..889e05d 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -160,7 +160,8 @@ DPMSSet(ClientPtr client, int level) rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive); if (rc != Success) return rc; - } + } else + dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset); /* For each screen, set the DPMS level */ for (i = 0; i < xf86NumScreens; i++) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0