April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46863 - /tags/branch-SLE-10-SP2-2_13_210/
by locilka＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: locilka Date: Fri Apr 18 16:24:22 2008 New Revision: 46863 URL: http://svn.opensuse.org/viewcvs/yast?rev=46863&view=rev Log: Created tag branch-SLE-10-SP2-2_13_210 Added: tags/branch-SLE-10-SP2-2_13_210/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46862 - in /branches/SuSE-SLE-10-SP2-Branch/installation: VERSION package/yast2-installation.changes src/clients/installation_worker.ycp src/include/misc.ycp
by locilka＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: locilka Date: Fri Apr 18 16:20:40 2008 New Revision: 46862 URL: http://svn.opensuse.org/viewcvs/yast?rev=46862&view=rev Log: - Calling 'xset -r off' at the beginning of installation (both first and second stage) in X on XEN (bnc #376945). - 2.13.210 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/installation_worker.ycp branches/SuSE-SLE-10-SP2-Branch/installation/src/include/misc.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/VERSION Fri Apr 18 16:20:40 2008 @@ -1 +1 @@ -2.13.209 +2.13.210 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes Fri Apr 18 16:20:40 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 16:16:24 CEST 2008 - locilka(a)suse.cz + +- Calling 'xset -r off' at the beginning of installation (both + first and second stage) in X on XEN (bnc #376945). +- 2.13.210 + +------------------------------------------------------------------- Thu Mar 27 13:35:09 CET 2008 - locilka(a)suse.cz - Fixed ZMD service handling, the correct name is novell-zmd Modified: branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/installation_worker.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/installation_worker.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/installation_worker.ycp Fri Apr 18 16:20:40 2008 @@ -75,8 +75,9 @@ return; } - // properly set up initial language + SetXENExceptions(); + // properly set up initial language if (Stage::initial ()) { Installation::encoding = Console::SelectFont( Language::language ); Modified: branches/SuSE-SLE-10-SP2-Branch/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/src/include/misc.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/src/include/misc.ycp Fri Apr 18 16:20:40 2008 @@ -196,4 +196,11 @@ return ( button == `confirm ); } + void SetXENExceptions() { + if ((UI::GetDisplayInfo()["TextMode"]:true == false) && SCR::Read (.probe.xen) == true) { + y2milestone ("XEN in X detected: running xset -r off"); + WFM::Execute (.local.bash, "xset -r off"); + } + } + } //end of include -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46861 - /tags/stable-2_16_12/bootloader/
by juhliarik＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: juhliarik Date: Fri Apr 18 16:04:49 2008 New Revision: 46861 URL: http://svn.opensuse.org/viewcvs/yast?rev=46861&view=rev Log: Created tag stable-2_16_12 for bootloader Added: tags/stable-2_16_12/bootloader/ - copied from r46860, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46860 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: juhliarik Date: Fri Apr 18 16:04:39 2008 New Revision: 46860 URL: http://svn.opensuse.org/viewcvs/yast?rev=46860&view=rev Log: added new version yast2-bootloader 2.16.12 M bootloader/VERSION M bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=46860&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Fri Apr 18 16:04:39 2008 @@ -1 +1 @@ -2.16.11 +2.16.12 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Apr 18 16:04:39 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 15:52:47 CEST 2008 - juhliarik(a)suse.cz + +- added fix for (bnc# 381192) bootloader uses grubonce _and_ kexec +- added detecting VirtualBox - cancel using kexec +- 2.16.12 + +------------------------------------------------------------------- Thu Apr 17 20:19:04 CEST 2008 - juhliarik(a)suse.cz - new version -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46859 - /trunk/installation/package/yast2-installation.changes
by juhliarik＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: juhliarik Date: Fri Apr 18 16:03:47 2008 New Revision: 46859 URL: http://svn.opensuse.org/viewcvs/yast?rev=46859&view=rev Log: added comment to changes M package/yast2-installation.changes Modified: trunk/installation/package/yast2-installation.changes Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Apr 18 16:03:47 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 18 16:01:13 CEST 2008 - juhliarik(a)suse.cz + +- Added text for using kexec (yast_inf_finish.ycp) + +------------------------------------------------------------------- Thu Apr 17 17:15:02 CEST 2008 - locilka(a)suse.cz - Added more debugging messages into ImageInstallation module. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46858 - /trunk/installation/src/clients/yast_inf_finish.ycp
by juhliarik＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: juhliarik Date: Fri Apr 18 16:01:38 2008 New Revision: 46858 URL: http://svn.opensuse.org/viewcvs/yast?rev=46858&view=rev Log: added text to console #1 for using kexec M yast_inf_finish.ycp * text for using kexec Modified: trunk/installation/src/clients/yast_inf_finish.ycp Modified: trunk/installation/src/clients/yast_inf_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/yast_in… ============================================================================== --- trunk/installation/src/clients/yast_inf_finish.ycp (original) +++ trunk/installation/src/clients/yast_inf_finish.ycp Fri Apr 18 16:01:38 2008 @@ -188,6 +188,22 @@ string cmd = sformat ("touch \"%1/kexec_done\"", Directory::vardir); // call command WFM::Execute(.local.bash_output, cmd); + if (! UI::TextMode()) + { + y2milestone ("Printing message about loading kernel via kexec"); + SCR::Write (.dev.tty.stderr, + _(" +*********************************************************** + +Loading installed kernel using kexec. + +Trying to load installed kernel via kexec instead of rebooting +Please, wait. + +*********************************************************** + ") + ); + } } linuxrc["Language"] = Language::language; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46857 - in /trunk/bootloader/src: clients/bootloader_finish.ycp modules/Bootloader.ycp
by juhliarik＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: juhliarik Date: Fri Apr 18 15:53:36 2008 New Revision: 46857 URL: http://svn.opensuse.org/viewcvs/yast?rev=46857&view=rev Log: added fix for "onetime boot" (bnc #381192) added detecting of VirtualBox (skipping kexec) M bootloader/src/clients/bootloader_finish.ycp * fix for bug M bootloader/src/modules/Bootloader.ycp * added detecting to function CopyKernelInird() Modified: trunk/bootloader/src/clients/bootloader_finish.ycp trunk/bootloader/src/modules/Bootloader.ycp Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Fri Apr 18 15:53:36 2008 @@ -182,13 +182,17 @@ Bootloader::Read (); // fate #303395: Use kexec to avoid booting between first and second stage // copy vmlinuz, initrd and flush kernel option into /var/lib/YaST2 - if (Linuxrc::InstallInf ("kexec_reboot") != "0") - Bootloader::CopyKernelInird(); - else - y2milestone("Installation started with kexec_reboot set 0 or without kexec_reboot option"); - - - return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); + retcode = false; + if (Linuxrc::InstallInf ("kexec_reboot") == "1") + { + retcode = Bootloader::CopyKernelInird(); + } else { + y2milestone("Installation started with kexec_reboot set 0"); + } + + // (bnc #381192) don't use it if kexec is used + if (!retcode) + return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); } else return retcode; Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Fri Apr 18 15:53:36 2008 @@ -1216,6 +1216,19 @@ y2milestone("Option kexec_reboot is false. kexec will not be used."); return true; } + + // checking if installation run on VirtualBox + string cmd = sformat("hwinfo --bios |grep Product"); + y2milestone("Checking if installation run on VirtualBox command: %1", cmd); + + map out = (map)WFM::Execute(.local.bash_output, cmd); + + if (find(out["stdout"]:"", "VirtualBox") != -1) + { + y2milestone ("Installation run on VirtualBox, skip kexec loading: %1", out); + return false; + } + // create defualt sections map<string,any> linux_default = BootCommon::CreateLinuxSection ("linux"); @@ -1240,13 +1253,13 @@ WFM::Execute(.local.mkdir, "/var/lib/YaST2"); // build command for copy kernel and initrd to /var/lib/YaST during instalation - string cmd = nil; + cmd = nil; cmd = sformat("/bin/cp %1%2 %1%3 %4", Installation::destdir, tostring(default_section["image"]:""), tostring(default_section["initrd"]:""), Directory::vardir); y2milestone("Command for copy: %1", cmd); - map out = (map) WFM::Execute (.local.bash_output, cmd); + out = (map) WFM::Execute (.local.bash_output, cmd); if (out["exit"]:nil != 0) { y2error ("Copy kernel and initrd failed, output: %1", out); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46856 - /tags/stable-2_16_39/network/
by jsrain＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: jsrain Date: Fri Apr 18 15:48:59 2008 New Revision: 46856 URL: http://svn.opensuse.org/viewcvs/yast?rev=46856&view=rev Log: Created tag stable-2_16_39 for network Added: tags/stable-2_16_39/network/ - copied from r46855, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46855 - in /trunk/network: ./ package/ src/installation/ src/lan/ src/modules/ src/provider/ src/remote/ src/routines/ src/services/
by jsrain＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: jsrain Date: Fri Apr 18 15:48:54 2008 New Revision: 46855 URL: http://svn.opensuse.org/viewcvs/yast?rev=46855&view=rev Log: merged texts from proofread Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/installation/inst_do_net_test.ycp trunk/network/src/lan/bridge.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/lan/help.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/modules/Host.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp trunk/network/src/provider/connection.ycp trunk/network/src/provider/provider.ycp trunk/network/src/remote/dialogs.ycp trunk/network/src/routines/complex.ycp trunk/network/src/routines/runtime.ycp trunk/network/src/routines/widgets.ycp trunk/network/src/services/dns.ycp trunk/network/src/services/proxy.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=46855&r1=468… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Apr 18 15:48:54 2008 @@ -1 +1 @@ -2.16.38 +2.16.39 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Apr 18 15:48:54 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 18 15:46:22 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread +- 2.16.39 + +------------------------------------------------------------------- Tue Apr 15 08:54:14 CEST 2008 - jsuchome(a)suse.cz - fixed testsuite again (do not save the logs) Modified: trunk/network/src/installation/inst_do_net_test.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_do… ============================================================================== --- trunk/network/src/installation/inst_do_net_test.ycp (original) +++ trunk/network/src/installation/inst_do_net_test.ycp Fri Apr 18 15:48:54 2008 @@ -623,7 +623,7 @@ y2milestone("Product::relnotesurl_all = %1", Product::relnotesurl_all); // Fallback for situation that mustn't exist if (Product::relnotesurl_all == nil || Product::relnotesurl_all == []) { - Popup::Warning(_("There is no URL for release notes defined. Internet test cannot be performed.")); + Popup::Warning(_("No URL for the release notes defined. Internet test cannot be performed.")); ret = false; } else { @@ -639,9 +639,9 @@ ret = Popup::ContinueCancel(_("Download of latest release notes failed due to server-side error. This does not necessarily mean misconfigured network. -Click 'Continue' to proceed to the next installation step. To skip any steps +Click Continue to proceed to the next installation step. To skip any steps requiring internet connection or to get back to your network configuration, -click 'Cancel'.")); +click Cancel.")); } // return code shows misconfigured network // return false Modified: trunk/network/src/lan/bridge.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/bridge.ycp?rev=4… ============================================================================== --- trunk/network/src/lan/bridge.ycp (original) +++ trunk/network/src/lan/bridge.ycp Fri Apr 18 15:48:54 2008 @@ -55,8 +55,9 @@ if (contains(confs, device)){ if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0") { if(!confirmed) { - valid = Popup::ContinueCancel(_("One or more selected devices are already configured. -To work properly configuration must be removed.")); + valid = Popup::ContinueCancel(_("At least one selected device is already configured. +Remove the configuration. +")); confirmed=true; } if (valid) { Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=… ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Fri Apr 18 15:48:54 2008 @@ -133,9 +133,11 @@ fw = LanItems::GetFirmwareForCurrentItem(); if (fw != ""){ if ((!Package::Installed(fw) && !Package::Available(fw))){ - Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from -%1 Add-On CD.\nTo install the firmware, add Add-On CD to your YaST software repositories and return -to this configuration dialog."), Product::name)); + Popup::Message(sformat(_("Firmware is needed. Install it from +%1 Add-On CD. +First add the Add-On CD to your YaST software repositories and return +to this configuration dialog. +"), Product::name)); return false; } else if (!contains(LanItems::Requires, fw)) LanItems::Requires = add(LanItems::Requires, fw); Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Fri Apr 18 15:48:54 2008 @@ -26,27 +26,28 @@ * @return dialog result */ /* Manual network card setup help 1/4 */ - string hw_help = _("Here, set up hardware-specific options for -your network device.") + + string hw_help = _("Set up hardware-specific options for +your network device here. +") + /* Manual network card setup help 2/4 */ /* translators: do not translated udev, MAC, BusID*/ -_("Udev rules are the rules for kernel device manager that allow -associating MAC address or BusID of the network device with its name (e.g -eth1, wlan0 ) and make device name persistent upon reboot. If you don't -know what udev and its rules is, you probably don't need to use this option") + +_("Udev Rules are rules for the Kernel device manager that allow +associating the MAC address or BusID of the network device with its name (for example, +eth1, wlan0 ) and assure a persistent device name upon reboot. +") + /* Manual network card setup help 2/4 */ -_("Kernel module. Enter kernel module (in other words, driver) name -for your network device. If the device is already configured, you may select -one from the drop-down list if more than one driver for your device is -available. In most of the cases it is however OK to use the default value.") + +_("Kernel Module. Enter the kernel module (driver) name +for your network device here. If the device is already configured, see if there are more than one drivers available for +your device in the drop-down list. If necessary, choose a driver from the list, but usually the default value works. +") + /* Manual networ card setup help 3/4 */ -_("Additionally, you may specify options for the kernel module. They should -be written in the format option=value. Each entry should be space -separated,for example, io=0x300 irq=5. Note: If two cards are -configured with the same module name, options will be merged while saving."); +_("Additionally, you may specify Options for the Kernel module. Use this format: option=value. Each entry should be space +separated,for example: io=0x300 irq=5. Note: If two cards are +configured with the same module name, options will be merged while saving. +"); if(!(LanItems::operation == `edit /* FIXME: unique || Lan::unique != "" */ || Arch::s390 () == true)) { Modified: trunk/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=468… ============================================================================== --- trunk/network/src/lan/help.ycp (original) +++ trunk/network/src/lan/help.ycp Fri Apr 18 15:48:54 2008 @@ -30,9 +30,9 @@ /* Network setup method help */ // NetworkManager and ifup are programs _("<big>Network Setup Method</big> -Use NetworkManager to have a desktop applet -manage connections for all interfaces. It is well-suited -to switching among wired and multiple wireless networks. +Use the NetworkManager to have a desktop applet +managing connections for all interfaces. It is well suited +for switching among wired and multiple wireless networks. ") + /* Network setup method help */ // NetworkManager and ifup are programs @@ -74,28 +74,26 @@ ") + _("For each route, enter destination network IP address, gateway address, -and netmask. To omit any of these values, use dash sign \"-\". Select also -the device through which the traffic to defined network will be routed ( -\"-\" stands for any interface).") + +and netmask. To omit any of these values, use dash sign \"-\". Select +the device through which the traffic to the defined network will be routed, as well.\"-\" is an alias for any interface. +") + /* Routing dialog help 2/2 */ _("Enable IP Forwarding if the system is a router."), "dhcp_hostname": -_("If you are using DHCP to get an IP address, check whether to get -a hostname via DHCP. The hostname of your host (which can be seen -by issuing the hostname command) will be set automatically by the -DHCP client. -You may want to disable this option if you connect to different -networks that assign different hostnames, because changing -the hostname at runtime may confuse the graphical desktop. +_("If you are using DHCP to get an IP address, check whether you get +a hostname via DHCP. You can see the hostname of you host using the hostname command. The hostname +will be set automatically by the DHCP client. +Changing the hostname at runtime may confuse the graphical Desktop. Therefore, disable this option if you connect to different +networks that assign different hostnames. "), "write_hostname": _("If you are using DHCP to get an IP address, your hostname will be written -to /etc/hosts and be resolvable as a 127.0.0.2 IP address. -This is the default behavior. If you want to disable this, uncheck this box -but your hostname will not be resolvable without an active network. +to <tt>/etc/hosts</tt> and be resolvable as a <tt>127.0.0.2</tt> IP address. +This is the default behavior. To disable this option, uncheck this box. +Now your hostname will not be resolvable without an active network. "), @@ -130,11 +128,10 @@ has been temporarily modified by %1. You have two options:") + /* Warning popup text 2/2 */ - _("<ol> -<li>Modify the current (changed) version of the file.</li> -<li>Press 'Accept' now and continue editing other (nonresolver) data. You -could return to this dialog later when the above service has terminated.</li> -</ol> "), + _("Modify the current version of the file. +Press Accept and continue editing other data. You are able to return to this dialog at a later time, +when the above service has terminated. +"), "bootproto": /* Address dialog help 1-6/8: dynamic address preferred */ @@ -145,33 +142,35 @@ ") + /* Address dialog help 2/8 */ - _("Select Dynamic address if you do not have a static IP address -assigned by the system administrator or your cable or DSL provider.") + _("Select Dynamic Address if you do not have a static IP address +assigned by the system administrator or your Internet provider. +") + /* Address dialog help 3/8 */ - _("You can choose one of the dynamic address assignment method. Select DHCP + _("You can choose one of the dynamic address assignment methods. Select DHCP if you have a DHCP server running on your local network. Network addresses are then obtained automatically from the server. ") + /* Address dialog help 4/8 */ - _("To automatically search for free IP and then assign it statically, select + _("To search for an IP address and assign it statically, select Zeroconf. To use DHCP and fall back to zeroconf, select DHCP + Zeroconf -. Otherwise, network addresses must be assigned statically."), +. Otherwise, the network addresses must be assigned Statically. +"), /* Address dialog help 5/8 */ "remoteip": -_("Enter the IP Address (e.g., 192.168.100.99) -for your computer and the Remote IP Address (e.g., 192.168.100.254) +_("Enter the IP Address (for example: <tt>192.168.100.99</tt>) for your computer, and the + Remote IP Address (for example: <tt>192.168.100.254</tt>) for your peer. "), /* Address dialog help 6/8 */ "netmask": - _("For Static Address Setup enter the static IP address (e.g., 192.168.100.99) -for your computer and the network mask (usually 255.255.255.0). Optionally, you can enter -a fully qualified hostname for this IP address. It will be written to /etc/hosts. + _("For Static Address Setup enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and +the network mask (usually <tt>255.255.255.0</tt>). Optionally, you can enter +a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>. ") + /* Address dialog help 8/8 */ @@ -196,19 +195,19 @@ "mtu": _("<big>Maximum Transfer Unit</big> -Maximum transfer unit (MTU) is the maximum size of the packet -transferred in one frame over the network. Normally, you do not need to -set MTU, but using lower MTU values may improve network performance, -especially on slow dial-up connections. Select one of the recommended values -or define your own one. +Maximum transfer unit (MTU) is the maximum size of the packet, +transferred over the network in one frame. Usually, you do not need to +set a MTU, but using lower MTU values may improve the network performance, +especially on slow dial-up connections. Either, select one of the recommended values, +or define another one. "), "bondslave": -_("Select the slave devices for the bond device. Only the devices whose Device Activation is set to 'Never' and have 'No Address Setup are available'."), +_("Select the slave devices for the bond device.\nOnly devices with the device activation set to Never and with No Address Setup are available."), "dhclient_help" : /* DHCP dialog help 1/8 */ -_("<big>DHCP client options</big>") + +_("<big>DHCP Client Options</big>") + /* DHCP dialog help 2/8 */ _("Request Broadcast Response causes the DHCP client @@ -225,20 +224,20 @@ /* DHCP dialog help 4/8 */ _("The Hostname to Send specifies a string used for the -hostname option field when dhcpcd sends messages to the DHCP server. Some +hostname option field, when dhcpcd sends messages to the DHCP server. Some DHCP servers update name server zones (forward and reverse records) -according to this hostname (dynamic DNS). - -Also, some DHCP servers require the Hostname to Send option field to -contain a specific string in the DHCP messages from clients. Leave AUTO -to send the current hostname (i.e. the one defined in /etc/HOSTNAME). -Leave the field empty for not sending a hostname. +according to this hostname (dynamic DNS). +Some DHCP servers require the Hostname to Send option field to +contain a specific string in the DHCP messages from clients. Leave AUTO +to send the current hostname (for example, the one defined in <tt>/etc/HOSTNAME</tt>). +For not sending a hostname leave the field empty. "), "additional": /* Aliases dialog help 1/3 */ - _("<big>Additional addresses</big> -Configure additional addresses of an interface (its aliases) in this table.") + + _("<big>Additional Addresses</big> +Configure additional addresses of an interface (its aliases) in this table. +") + /* Aliases dialog help 2/3 */ _("Enter an Alias Name, an IP Address, and @@ -252,18 +251,19 @@ // this is suited to the button-switched key typing // Translators: dialog help "wep_key" : - _("Choose among three key input types for your key. + _("Choose between three Key Input Types for your key. Passphrase: The key is generated from the phrase entered. ASCII: The ASCII values of the characters entered form the key. Enter 5 characters for 64-bit keys, up to 13 characters for 128-bit keys, up to 16 characters for 156-bit keys, and up to 29 characters for 256-bit keys. - Hexadecimal: Directly enter the hex codes of the key. Enter + Hexadecimal: Enter the hex codes of the key, directly. Enter 10 hex digits for 64-bit keys, 26 digits for 128-bit keys, 32 digits for 156-bit keys, and 58 digits for 256-bit keys. You can -use hyphens ('-') to separate pairs or groups of digits, for example, -'0a5f-41e6-48'. - "), +use hyphens <tt>-</tt> to separate pairs or groups of digits, for example, +<tt>0a5f-41e6-48</tt>. + +"), // Wireless dialog help "wireless": Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Fri Apr 18 15:48:54 2008 @@ -309,7 +309,7 @@ if( update_resolv ) { /* Progress step 3/3 */ - ProgressNextStage(_("Updating /etc/resolv.conf...")); + ProgressNextStage(_("Updating <tt>/etc/resolv.conf</tt>...")); /* update /etc/resolv.conf */ SCR::Write(.etc.resolv_conf.search, searchlist); Modified: trunk/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Host.ycp?rev… ============================================================================== --- trunk/network/src/modules/Host.ycp (original) +++ trunk/network/src/modules/Host.ycp Fri Apr 18 15:48:54 2008 @@ -104,7 +104,7 @@ Progress::New(caption, " ", size(steps), steps, [], ""); - ProgressNextStage(_("Updating /etc/hosts...")); + ProgressNextStage(_("Updating <tt>/etc/hosts</tt>...")); /* Create if not exists, otherwise backup */ if(SCR::Read(.target.size, hosts_file) < 0) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Fri Apr 18 15:48:54 2008 @@ -209,9 +209,10 @@ if (size((list<string>)SCR::Read(.target.dir, "/etc/ndiswrapper"))>0){ y2milestone("ndiswrapper: configuration found"); if ((integer)SCR::Execute(.target.bash, "lsmod |grep -q ndiswrapper")!=0 - && Popup::YesNo(_("There is ndiswrapper configuration detected -but kernel module wasn't modprobed. -Should I modprobe ndiswrapper?"))) { + && Popup::YesNo(_("There is a ndiswrapper configuration detected, +but the Kernel module was not modprobed. +Do you want to modprobe ndiswrapper? +"))) { if (ModuleLoading::Load("ndiswrapper", "", "", "", false, true)==`fail) Popup::Error(_("ndiswrapper kernel module wasn't loaded. Check configuration manually.")); } Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Fri Apr 18 15:48:54 2008 @@ -474,8 +474,8 @@ } else overview = add(overview, Summary::Device(descr, Summary::NotConfigured())); - string conn = HTML::Bold ( (Items[key, "hwinfo", "link"]:false == true)?"":sformat("(%1)", _("not connected") )); - if (size(Items[key, "hwinfo"]:$[])==0) conn = HTML::Bold(sformat("(%1)", _("no hwinfo"))); + string conn = HTML::Bold ( (Items[key, "hwinfo", "link"]:false == true)?"":sformat("(%1)", _("Not connected") )); + if (size(Items[key, "hwinfo"]:$[])==0) conn = HTML::Bold(sformat("(%1)", _("No hwinfo"))); string mac_dev=""; if (hasAnyValue(Items[key, "hwinfo", "mac"]:"")) mac_dev= HTML::Bold ("MAC : ") + Items[key, "hwinfo", "mac"]:"" + " "; else if (hasAnyValue(Items[key, "hwinfo", "busid"]:"")) mac_dev= HTML::Bold ("BusID : ") + Items[key, "hwinfo", "busid"]:"" + " "; @@ -485,8 +485,9 @@ if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0) rich = rich + _("Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."); else if (hasAnyValue(Items[key, "ifcfg"]:"") ) rich = rich + HTML::List (bullets); - else rich = rich + _("<UL><LI>The device is not configured</LI><LI>Press Edit -to configure</LI></UL>"); + else rich = rich + _("The device is not configured. Press Edit +to configure. +"); Items[key, "table_descr"] = $[ Modified: trunk/network/src/provider/connection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/provider/connection.… ============================================================================== --- trunk/network/src/provider/connection.ycp (original) +++ trunk/network/src/provider/connection.ycp Fri Apr 18 15:48:54 2008 @@ -122,8 +122,8 @@ manually enter the DNS.") + /* Connection dialog help 4/9 */ -_("When Automatically Reconnect is enabled, the connection will -be automatically reestablished after failure. +_("If Automatically Reconnect is enabled, the connection will +be reestablished automatically after failure. ") + /* Connection dialog help 5/9 */ Modified: trunk/network/src/provider/provider.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/provider/provider.yc… ============================================================================== --- trunk/network/src/provider/provider.ycp (original) +++ trunk/network/src/provider/provider.ycp Fri Apr 18 15:48:54 2008 @@ -505,8 +505,9 @@ } */ // NM doesn't ask for password (#225793) else if(ask_pass && NetworkService::IsManaged ()){ - Popup::Warning(_("NetworkManager doesn't have ability to ask for password. -Use KInternet (without NetworkManager) or store password on the system.")); + Popup::Warning(_("NetworkManager does not have the ability to ask for the password. +Use KInternet (without NetworkManager) or store passwords on the system. +")); continue; } else if(filterchars(phone, phonevalidchars) != phone && Modified: trunk/network/src/remote/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/remote/dialogs.ycp?r… ============================================================================== --- trunk/network/src/remote/dialogs.ycp (original) +++ trunk/network/src/remote/dialogs.ycp Fri Apr 18 15:48:54 2008 @@ -48,11 +48,11 @@ /* Remote Administration dialog help %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801 */ string help = sformat ( -_("<big>Remote administration settings</big> +_("<big>Remote Administration Settings</big> If this feature is enabled, you can administer this machine remotely from another machine. Use a VNC -client, such as krdc (connect to <hostname>:%1), or -a Java-capable Web browser (connect to http://<hostname>:%2/). +client, such as krdc (connect to <tt><hostname>:%1</tt>), or +a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>). This form of remote administration is less secure than using SSH. "), 5901, 5801) + firewall_help; Modified: trunk/network/src/routines/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/complex.ycp… ============================================================================== --- trunk/network/src/routines/complex.ycp (original) +++ trunk/network/src/routines/complex.ycp Fri Apr 18 15:48:54 2008 @@ -589,7 +589,7 @@ break; default : y2warning (1, "invalid class %1", class); } - string rich = HTML::Bold(name) + getConnMacBusDescription((map)card, (list<map>)sum) + _("<UL><LI>The device is not configured</LI><LI>Press Configure for configuration</LI></UL>"); + string rich = HTML::Bold(name) + getConnMacBusDescription((map)card, (list<map>)sum) + _("The device is not configured. Press Configure for configuration."); return $[ "id":id, "table_descr":desc, Modified: trunk/network/src/routines/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/runtime.ycp… ============================================================================== --- trunk/network/src/routines/runtime.ycp (original) +++ trunk/network/src/routines/runtime.ycp Fri Apr 18 15:48:54 2008 @@ -96,7 +96,7 @@ { string message = // notification about package needed 1/2 - _("Because Device Control for Non-root User has been enabled, the %1 packages must be installed.") + + _("The %1 packages must be installed because device control for non-root users has benn established.") + // notification about package needed 2/2 _("Do you want to install it now?"); Modified: trunk/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/widgets.ycp… ============================================================================== --- trunk/network/src/routines/widgets.ycp (original) +++ trunk/network/src/routines/widgets.ycp Fri Apr 18 15:48:54 2008 @@ -48,9 +48,9 @@ "help": // Details dialog help _("<big>Device Control</big> -Normally only the system administrator is allowed to activate and +Usually, only the system administrator is allowed to activate and deactivate a network interface. With Enable Device Control for Non-root User -Via KInternet, an ordinary user may control the interface with KInternet. +Via KInternet, any user may control the interface via KInternet. "), ], @@ -116,8 +116,9 @@ // Combo box option for Device Activation "label": _("Manually"), // help text for Device Activation - "help": _("Manually: You control the interface manually -via 'ifup' or 'KInternet' (See 'User Controlled' below)."), + "help": _("Press Manually tocontrol the interface manually +via ifup or KInternet (See User Controlled below). +"), ], "ifplugd": $[ // Combo box option for Device Activation @@ -143,9 +144,9 @@ // Combo box option for Device Activation "label": _("On NFSroot"), // help text for Device Activation - "help": _("Using On NFSroot is nearly like 'auto'. But interfaces with this startmode will never -be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works. -Use this when you have a nfs or iSCSI root filesystem. + "help": _("Using On NFSroot is similar to <tt>auto</tt>. Interfaces with this startmode will never +be shut down via <tt>rcnetwork stop</tt>. <tt>ifdown <iface></tt> is still available. +Use this if you have an NFS or iSCSI root filesystem. "), ], "nfsroot" : $[ @@ -169,7 +170,7 @@ // Device activation main help. The individual parts will be // substituted as %1 _("<big>Device Activation</big> -Choose, when the network interface should be brought up. At Boot Time starts it during system boot. +Choose when to bring up the network interface.At Boot Time activates it during system boot, Never does not start the device. %1 "), Modified: trunk/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/dns.ycp?rev… ============================================================================== --- trunk/network/src/services/dns.ycp (original) +++ trunk/network/src/services/dns.ycp Fri Apr 18 15:48:54 2008 @@ -147,7 +147,7 @@ */ define void InitDhcpHostname (string key) { UI::ChangeWidget (`id("DHCP_HOSTNAME"), `Enabled, has_dhcp); - if (!has_dhcp) UI::ReplaceWidget(`id ("dh_host_text"),`Label(_("no interface with dhcp"))); + if (!has_dhcp) UI::ReplaceWidget(`id ("dh_host_text"),`Label(_("No interface with dhcp"))); // the hostname dialog proposes to update it by DHCP on a laptop (#326102) else UI::ChangeWidget(`id("DHCP_HOSTNAME"), `Value, hn_settings["DHCP_HOSTNAME"]:true); return nil; @@ -162,7 +162,7 @@ */ define symbol HandleDhcpResolv (string key, map event) { UI::ChangeWidget (`id ("DHCP_RESOLV"), `Enabled, has_dhcp && resolver_modifiable); - if (!has_dhcp) UI::ReplaceWidget(`id ("dh_resolv_text"),`Label(_("no interface with dhcp"))); + if (!has_dhcp) UI::ReplaceWidget(`id ("dh_resolv_text"),`Label(_("No interface with dhcp"))); return nil; } Modified: trunk/network/src/services/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/proxy.ycp?r… ============================================================================== --- trunk/network/src/services/proxy.ycp (original) +++ trunk/network/src/services/proxy.ycp Fri Apr 18 15:48:54 2008 @@ -286,7 +286,7 @@ string caption = _("Proxy Configuration"); /* Proxy dialog help 1/8 */ - string help = _("Here, configure your Internet proxy (caching) settings. + string help = _("Configure your Internet proxy (caching) settings here. Note: In some cases you may need to relogin for the settings to take effect") + /* Proxy dialog help 2/8 */ @@ -309,10 +309,9 @@ /* Proxy dialog help 5/8 */ - _("With the Use the Same Proxy for All Protocols option checked, it is -enough to fill in the HTTP proxy URL, which will then be used for all protocols -(HTTP, HTTPS and FTP). -") + + _("If you have the Use the Same Proxy for All Protocols option checked, it is +enough to fill in the HTTP proxy URL. It will be used for all protocols +(HTTP, HTTPS and FTP).\n") + /* Proxy dialog help 6/8 */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46854 - /tags/stable-2_16_36/packager/
by locilka＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: locilka Date: Fri Apr 18 15:42:53 2008 New Revision: 46854 URL: http://svn.opensuse.org/viewcvs/yast?rev=46854&view=rev Log: Created tag stable-2_16_36 for packager Added: tags/stable-2_16_36/packager/ - copied from r46853, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0