March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67789 - in /trunk/nfs-server: package/yast2-nfs-server.changes src/NfsServer.ycp src/nfs_server.ycp src/routines.ycp src/ui.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:28:57 2012 New Revision: 67789 URL: http://svn.opensuse.org/viewcvs/yast?rev=67789&view=rev Log: - merged proofread texts Modified: trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/NfsServer.ycp trunk/nfs-server/src/nfs_server.ycp trunk/nfs-server/src/routines.ycp trunk/nfs-server/src/ui.ycp Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-ser… ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Thu Mar 29 15:28:57 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:28:39 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Fri Mar 16 08:49:43 UTC 2012 - mfilka(a)suse.com - Fixed testsuites Modified: trunk/nfs-server/src/NfsServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/NfsServer.ycp?rev… ============================================================================== --- trunk/nfs-server/src/NfsServer.ycp (original) +++ trunk/nfs-server/src/NfsServer.ycp Thu Mar 29 15:28:57 2012 @@ -345,7 +345,7 @@ { if (! Service::Start("idmapd")) { - Report::Error(_("Unable to start idmapd. Please check your domain setting.")); + Report::Error(_("Unable to start idmapd. Check your domain setting.")); ok = false; } } @@ -353,7 +353,7 @@ { if (! Service::Restart("idmapd")) { - Report::Error(_("Unable to restart idmapd")); + Report::Error(_("Unable to restart idmapd.")); ok = false; } } @@ -364,7 +364,7 @@ { if(!Service::Stop("idmapd")) { - Report::Error(_("Unable to stop idmapd")); + Report::Error(_("Unable to stop idmapd.")); ok = false; } } @@ -377,7 +377,7 @@ if (! Service::Start("svcgssd")) { // FIXME svcgssd is gone! (only nfsserver is left) - Report::Error(_("Unable to start svcgssd. Please ensure your kerberos and gssapi (nfs-utils) set up is correct.")); + Report::Error(_("Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct.")); ok = false; } } Modified: trunk/nfs-server/src/nfs_server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/nfs_server.ycp?re… ============================================================================== --- trunk/nfs-server/src/nfs_server.ycp (original) +++ trunk/nfs-server/src/nfs_server.ycp Thu Mar 29 15:28:57 2012 @@ -254,14 +254,14 @@ if (v4domain != "") { if (!NfsServer::enable_nfsv4) { - CommandLine::Print(_("Domain cannot be set without enabling NFSv4. Please use the 'set enablev4' command.")); + CommandLine::Print(_("Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command.")); return false; } NfsServer::domain = v4domain; } if (nfs_sec == "" && enablev4 == "" && v4domain == "") { - CommandLine::Print(_("Command set must be used as in 'set option=value'. Please use 'set help' to get information about the options.")); + CommandLine::Print(_("Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options.")); return false; } @@ -300,7 +300,7 @@ ], "set" : $[ "handler" : NfsServerSetOptionHandler, - "help" : _("Set the parameters for domain, security and enablev4"), + "help" : _("Set the parameters for domain, security and enablev4."), ] ], "options" : $[ @@ -319,15 +319,15 @@ ], "domain" : $[ "type" : "string", - "help" : _("Domain specification for NFSv4 Idmapping, such as 'localdomain' or 'abc.com' etc."), + "help" : _("Domain specification for NFSv4 ID mapping, such as 'localdomain' or 'abc.com' etc."), ], "enablev4" : $[ "type" : "string", - "help" : _("Yes/No option for enabling/disabling support for NFSv4"), + "help" : _("Yes/No option for enabling/disabling support for NFSv4."), ], "security" : $[ "type" : "string", - "help" : _("Yes/No option for enabling/disabling secure NFS"), + "help" : _("Yes/No option for enabling/disabling secure NFS."), ] ], "mappings" : $[ Modified: trunk/nfs-server/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/routines.ycp?rev=… ============================================================================== --- trunk/nfs-server/src/routines.ycp (original) +++ trunk/nfs-server/src/routines.ycp Thu Mar 29 15:28:57 2012 @@ -453,7 +453,8 @@ // %1 is a list of exported paths Report::Warning (sformat (_("There are unbalanced parentheses in export options for %1. -Probably there is spurious whitespace in the configuration file."), +Likely, there is a spurious whitespace in the configuration file. +"), bad_shares_s)); } } Modified: trunk/nfs-server/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/ui.ycp?rev=67789&… ============================================================================== --- trunk/nfs-server/src/ui.ycp (original) +++ trunk/nfs-server/src/ui.ycp Thu Mar 29 15:28:57 2012 @@ -246,8 +246,9 @@ if (ret == `ok && !NfsServer::enable_nfsv4) { if (issubstring (opts,"fsid=0")) { - Popup::Message(_("'fsid=0'is not a valid option unless -NFSv4 is enabled (previous page)")); + Popup::Message(_("'fsid=0' is not a valid option unless +NFSv4 is enabled (previous page). +")); ret = nil; } } @@ -330,15 +331,15 @@ help_text = help_text + fw_cwm_widget["help"]:""; help_text = help_text + -_("If the server needs to handle NFSv4 clients, check Enable NFSv4, -and fill in the NFSv4 domain name you want the id mapping daemon to use. Leave +_("If the server needs to handle NFSv4 clients, check Enable NFSv4 +and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave it as localdomain or refer to the man page for idmapd and idmapd.conf if you are not sure. "); help_text = help_text + // FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm -_("If the server and client must authenticate using GSS library, please enable the Enable GSS Security -checkbox. For being able to use GSS API, currently you need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system +_("If the server and client must authenticate using GSS library, check the +Enable GSS Security box. To use GSS API, you currently need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system. "); /* The end of the definitions */ @@ -509,7 +510,7 @@ if (NfsServer::enable_nfsv4) { // Help, part 4 of 5, caution about fsid=0 in case NFSv4 is enabled. - help_text = help_text + _("The NFSv4 option is enabled in the previous page. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client."); + help_text = help_text + _("NFSv4 is enabled. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client."); // bnc#471874, NFS4 is complex and so is our UI :-/ // but let's fix the help at least -- 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] r67788 - in /trunk/nfs-client: package/yast2-nfs-client.changes src/nfs.ycp src/ui.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:28:25 2012 New Revision: 67788 URL: http://svn.opensuse.org/viewcvs/yast?rev=67788&view=rev Log: - merged proofread texts Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/nfs.ycp trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Mar 29 15:28:25 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:28:12 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Fri Feb 24 12:09:03 UTC 2012 - mfilka(a)suse.com - fixed testsuite Modified: trunk/nfs-client/src/nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/nfs.ycp?rev=67788… ============================================================================== --- trunk/nfs-client/src/nfs.ycp (original) +++ trunk/nfs-client/src/nfs.ycp Thu Mar 29 15:28:25 2012 @@ -284,7 +284,7 @@ "type" : "string", // nfs or nfs4 // command line option help // fstab(5): fs_type - "help" : _("File system id, supported nfs and nfs4. Default value is nfs."), + "help" : _("File system ID, supported nfs and nfs4. Default value is nfs."), ], ], "mappings" : $[ Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67788&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Mar 29 15:28:25 2012 @@ -502,15 +502,17 @@ about mounting NFS and mount options, refer to <tt>man nfs.</tt>") + // Help, part 3 of 3 -_("To mount a new NFS share, use Add button. To change the configuration of -currently mounted share, use Edit button. Remove and unmount selected share by -Delete button."); +_("To mount a new NFS share, click Add. To change the configuration of +a currently mounted share, click Edit. Remove and unmount a selected +share with Delete. +"); - string help_text2 = _("If you need to access NFSv4 shares (NFSv4 is a newer version -of NFS protocol), check Enable NFSv4 option. In that case, you might need to supply -specific NFSv4 Domain Name, required for correct setting of file/directory access -rights.") + fw_cwm_widget["help"]:""; + string help_text2 = _("If you need to access NFSv4 shares (NFSv4 is a newer version of the NFS +protocol), check the Enable NFSv4 option. In that case, you might need +to supply specific a NFSv4 Domain Name required for the correct setting +of file/directory access rights. +") + fw_cwm_widget["help"]:""; void EnableDisableButtons() { -- 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] r67787 - in /trunk/network: package/ src/clients/ src/installation/ src/lan/ src/modules/ src/provider/ src/routines/ src/services/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:26:58 2012 New Revision: 67787 URL: http://svn.opensuse.org/viewcvs/yast?rev=67787&view=rev Log: - merged proofread texts Modified: trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp trunk/network/src/clients/routing.ycp trunk/network/src/installation/inst_do_net_test.ycp trunk/network/src/lan/address.ycp trunk/network/src/lan/cmdline.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/lan/help.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/provider/provider.ycp trunk/network/src/routines/routines.ycp trunk/network/src/services/proxy.ycp 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 Thu Mar 29 15:26:58 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:26:35 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Wed Mar 14 12:00:35 CET 2012 - mvidner(a)suse.cz - No need to chmod /etc/sysconfig/network/providers after placing Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp… ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Thu Mar 29 15:26:58 2012 @@ -356,7 +356,7 @@ if (Lan::isAnyInterfaceDown()){ integer timeout = LanItems::autoinstall_settings["strict_IP_check_timeout"]:0; y2debug("timeout %1", timeout); - string error_text = _("Configuration Error : uninitialized interface!"); + string error_text = _("Configuration Error: uninitialized interface."); if (timeout == 0) Popup::Error(error_text); else Popup::TimedError(error_text, timeout); } Modified: trunk/network/src/clients/routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/routing.ycp?… ============================================================================== --- trunk/network/src/clients/routing.ycp (original) +++ trunk/network/src/clients/routing.ycp Thu Mar 29 15:26:58 2012 @@ -163,7 +163,7 @@ if (addedit == `add) { if ( destination == "" || gateway == "" ) { - CommandLine::Error( _("At least destination and gateway IP addresses must be specified")); + CommandLine::Error( _("At least destination and gateway IP addresses must be specified.")); return false; } @@ -180,7 +180,7 @@ else if ( addedit == `edit) { if ( destination == "") { - CommandLine::Error( _("Destination IP address must be specified")); + CommandLine::Error( _("Destination IP address must be specified.")); return false; } if ( size( options) < 2 ) { 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 Thu Mar 29 15:26:58 2012 @@ -649,11 +649,12 @@ //popup informing user about the failure to retrieve release notes //most likely due to server-side error ret = Popup::ContinueCancel(_("Download of latest release notes failed due to server-side error. -This does not necessarily mean misconfigured network. +This does not necessarily imply a faulty network configuration. 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'.")); +requiring an internet connection or to get back to your network configuration, +click 'Cancel'. +")); } // return code shows misconfigured network // return false Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Thu Mar 29 15:26:58 2012 @@ -580,10 +580,12 @@ } else { // There'll be no 127.0.0.2 -> remind user to define some hostname if( !Host::NeedDummyIP() && - !Popup::YesNo( _("No hostname has been specified. It is recommended to associate -some hostname with static IP, otherwise the machine name will -not be resolvable without active network connection.\n -Really leave the hostname blank?")) ) { + !Popup::YesNo( _("No hostname has been specified. We recommend to associate +a hostname with a static IP, otherwise the machine name will +not be resolvable without an active network connection. + +Really leave the hostname blank? +")) ) { UI::SetFocus(`hostname); return false; } @@ -741,7 +743,7 @@ "custom_widget": `HBox( `ComboBox(`id(`vlan_eth), `opt(`notify), _("Real Interface for &VLAN"), []), - `IntField(`id(`vlan_id), `opt(`notify), _("VLAN id"), 0, 9999, 0) + `IntField(`id(`vlan_id), `opt(`notify), _("VLAN ID"), 0, 9999, 0) ), "opt": [`hstretch], "init": InitVLANSlave, @@ -768,7 +770,7 @@ /* ComboBox label */ "label": _("&Bond Driver Options"), "opt": [`hstretch, `editable], - "help": _("Select the bond driver options, and edit it if necessary. "), + "help": _("Select the bond driver options and edit them if necessary. "), "items" : [["mode=balance-rr miimon=100"], ["mode=active-backup miimon=100"], ["mode=balance-xor miimon=100"], ["mode=broadcast miimon=100"], ["mode=802.3ad miimon=100"], ["mode=balance-tlb miimon=100"], ["mode=balance-alb miimon=100"]] ], @@ -1004,7 +1006,7 @@ if ( fw_is_installed ) wd["FWZONE", "items"] = SuSEFirewall4Network::FirewallZonesComboBoxItems(); else - wd["FWZONE", "items"] = [ ["", _("Firewall is not installed") ] ]; + wd["FWZONE", "items"] = [ ["", _("Firewall is not installed.") ] ]; term label = `HBox ( Modified: trunk/network/src/lan/cmdline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/cmdline.ycp?rev=… ============================================================================== --- trunk/network/src/lan/cmdline.ycp (original) +++ trunk/network/src/lan/cmdline.ycp Thu Mar 29 15:26:58 2012 @@ -115,7 +115,7 @@ LanItems::bootproto = options["bootproto"]:"none"; if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){ - Report::Error(_("Impossible value for bootproto!")); + Report::Error(_("Impossible value for bootproto.")); return false; } @@ -124,7 +124,7 @@ LanItems::netmask = options["netmask"]:"255.255.255.0"; LanItems::startmode = options["startmode"]:"auto"; if (!contains(["auto", "ifplugd", "nfsroot"], LanItems::startmode)){ - Report::Error(_("Impossible value for startmode!")); + Report::Error(_("Impossible value for startmode.")); return false; } @@ -157,12 +157,12 @@ LanItems::bootproto = options["bootproto"]:"none"; if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){ - Report::Error(_("Impossible value for bootproto!")); + Report::Error(_("Impossible value for bootproto.")); return false; } if (LanItems::bootproto=="static"){ if (!(size(options["ip"]:"")>0)){ - Report::Error(_("For static configuration \"ip\" option is needed!")); + Report::Error(_("For static configuration, the \"ip\" option is needed.")); return false; } LanItems::ipaddr = options["ip"]:""; @@ -178,7 +178,7 @@ LanItems::startmode = options["startmode"]:"auto"; if (!contains(["auto", "ifplugd", "nfsroot"], LanItems::startmode)){ - Report::Error(_("Impossible value for startmode!")); + Report::Error(_("Impossible value for startmode.")); return false; } 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 Thu Mar 29 15:26:58 2012 @@ -112,8 +112,8 @@ if (fw != ""){ if ((!Package::Installed(fw) && !Package::Available(fw))){ Popup::Message(sformat(_("Firmware is needed. Install it from -Add-On CD. -First add the Add-On CD to your YaST software repositories then return +the add-on CD. +First add the add-on CD to your YaST software repositories then return to this configuration dialog. "))); return false; @@ -121,9 +121,12 @@ if (!contains(LanItems::Requires, fw)) LanItems::Requires = add(LanItems::Requires, fw); } else { - return (Popup::ContinueCancel(_("The device needs a firmware to function properly. It can be usually downloaded from your driver vendor web page.\nIf you have already downloaded and installed the firmware, click Continue -to configure the device. Otherwise click Cancel and return to this dialog -once you have installed the firmware."))); + return (Popup::ContinueCancel(_("The device needs a firmware to function properly. Usually, it can be +downloaded from your driver vendor's Web page. +If you have already downloaded and installed the firmware, click +Continue to configure the device. Otherwise click Cancel and +return to this dialog once you have installed the firmware. +"))); } } @@ -136,7 +139,7 @@ if(PackagesInstall(LanItems::Requires) != `next) return false; if (fw=="b43-fwcutter"){ - if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For successful firmware installation the, 'install_bcm43xx_firmware' script needs to be executed. Execute it now ?"))){ + if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"))){ map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware"); if (command["exit"]:-1!=0) Popup::ErrorDetails(_("An error occurred during firmware installation."), command["stderr"]:""); 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 Thu Mar 29 15:26:58 2012 @@ -32,9 +32,9 @@ /* Manual network card setup help 2/4 */ /* translators: do not translated udev, MAC, BusID*/ -_("Udev Rules are rules for the Kernel device manager that allow -associating MAC address or BusID of the network device with its name (for example, -eth1, wlan0 ) and assures a persistent device name upon reboot. +_("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 assures a persistent device name upon reboot. ") + _("Show visible port identification allows you to physically identify now configured NIC. @@ -48,13 +48,12 @@ ") + /* Manual networ card setup help 3/4 */ -_("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. +_("Additionally, 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, the options will be merged while saving. ") + -_("If you write something into Ethtool options, ifup will call ethtool with this options. -"); +_("If you specify options via Ethtool options, ifup will call ethtool with these options.\n"); if(!(LanItems::operation == `edit || Arch::s390 ())) { @@ -483,7 +482,7 @@ // when dev_name changed, rename ifcfg (both in NetworkInterfaces and LanItems) if (new_name!=old_name){ if (contains(NetworkInterfaces::List(""), new_name)){ - Popup::Error(_("Configuration name already exists!")); + Popup::Error(_("Configuration name already exists.")); ret=nil; } else{ y2internal("LanItems::GetReplacedItemUdev2 %1", LanItems::GetReplacedItemUdev("NAME", new_name)); Modified: trunk/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=677… ============================================================================== --- trunk/network/src/lan/help.ycp (original) +++ trunk/network/src/lan/help.ycp Thu Mar 29 15:26:58 2012 @@ -30,9 +30,9 @@ /* Network setup method help */ // NetworkManager and ifup are programs _("<big>Network Setup Method</big> -Use the NetworkManager to have a desktop applet +Use the NetworkManager as a desktop applet managing connections for all interfaces. It is well suited -for switching among wired and multiple wireless networks. +for switching among wired and wireless networks. ") + /* Network setup method help */ // NetworkManager and ifup are programs @@ -49,16 +49,16 @@ Press Add to configure a new network card manually. ") + _("<big>Configuring or Deleting:</big> Choose a network card to change or remove. -Then press Edit or Delete as desired. +Then press Edit or Delete respectively. "), "ipv6" : /* IPv6 help */ _("<big>IPv6 Protocol Settings</big> Check Enable IPv6 to enable the ipv6 module in the kernel. -It is possible to use IPv6 together with IPv4. This is a default option. -To disable IPv6, uncheck this option (this will blacklist the kernel -module for ipv6). If the IPv6 protocol is not used on your network, the response +It is possible to use IPv6 together with IPv4. This is the default option. +To disable IPv6, uncheck this option. This will blacklist the kernel +module for ipv6. If the IPv6 protocol is not used on your network, the response time can be faster. ") + @@ -74,17 +74,17 @@ ") + _("For each route, enter destination network IP address, gateway address, -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. +and netmask. To omit any of these values, use a dash sign \"-\". Select +the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface. ") + /* Routing dialog help 2/2 */ _("Enable IP Forwarding (forwarding packets from external networks to the internal one) if this system is a router. Both IPv4 and IPv6 connectivity will be affected by this setting. Important: if the firewall is enabled, allowing IP forwarding alone is not enough. -You should enable masquerade and/or set at least one redirect rule in firewall. You may -use YaST firewall module for that."), +You should enable masquerading and/or set at least one redirect rule in the +firewall configuration. Use the YaST firewall module. +"), "dhcp_hostname": _("If you are using DHCP to get an IP address, check whether you get @@ -95,10 +95,11 @@ "write_hostname": _("Assign Hostname to Loopback IP associates your hostname with -<tt>127.0.0.2</tt> (loopback) IP address in <tt>/etc/hosts</tt>. This is an +the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a useful option if you want to have the hostname resolvable at all times, even -without active network. In all other cases, use it carefully, especially -if this computer provides some network services."), +without an active network. In all other cases, use it carefully, especially +if this computer provides some network services. +"), "searchlist_s": _("Enter the name servers and domain search list for resolving @@ -123,29 +124,33 @@ command."), "dns_config_policy" : -_("Select the way how DNS configuration (name servers, search list, the content of -/etc/resolv.conf file) will be modified. Normally, it is handled by netconfig -script which merges the data statically defined here with those obtained dynamically (e.g. from -DHCP client, NetworkManager etc.). This is the default, Use Default Policy option and -it is sufficient for most of the configurations.") + +_("Select the way how the DNS configuration will be modified (name servers, +search list, the content of /etc/resolv.conf). Normally, it is handled +by the netconfig script, which merges statically defined data with +dynamically obtained data (e.g. from the DHCP client, NetworkManager, +etc.). This is the default. Use Default Policy is sufficient for most +configurations. +") + -_("By choosing Only Manually option, netconfig will no longer be allowed to modify -/etc/resolv.conf. You can however edit the file manually. By choosing Use Custom Policy -option, you may specify a custom policy string, which consists of comma-separated list of interface -names, including wildcards, with STATIC and STATIC_FALLBACK as predefined special values. For more -information, see netconfig manual page. Note: leaving the field blank is the same as using -Only Manually policy."), +_("By choosing Only Manually, netconfig will no longer be +allowed to modify /etc/resolv.conf. You can however edit the file +manually. By choosing Use Custom Policy, you may specify a custom +policy string, which consists of a comma-separated list of interface names, +including wildcards, with STATIC and STATIC_FALLBACK as predefined special +values. For more information, see the netconfig manual page. Note: +Leaving the field blank is the same as using the Only Manually +policy. +"), "bootproto": /* Address dialog help 1-6/8: dynamic address preferred */ /* Address dialog help 1/8 */ _("<big>Address Setup</big> -Select No Address Setup if you do not want any IP address for this device. +Select No Address Setup if you do not want to assign an IP address to this device. This is particularly useful for bonding ethernet devices. ") + - _("Check iBFT if you want to keep network configured in your BIOS. -") + _("Check iBFT if you want to keep the network configured in your BIOS.\n") + /* Address dialog help 2/8 */ _("Select Dynamic Address if you do not have a static IP address @@ -153,9 +158,9 @@ ") + /* Address dialog help 3/8 */ - _("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. + _("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 automatically obtained from the server. ") + /* Address dialog help 4/8 */ @@ -204,8 +209,8 @@ 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. +especially on slow dial-up connections. Either select one of the recommended +values or define another one. "), "bondslave": @@ -224,13 +229,13 @@ /* DHCP dialog help 3/7 */ _("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). 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. +If you do not want to send a hostname, leave the field empty. "), "additional": @@ -258,11 +263,11 @@ "wep_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 + ASCII: The ASCII values of the characters entered constitute 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: Enter the hex codes of the key, directly. 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 <tt>-</tt> to separate pairs or groups of digits, for example, 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 Thu Mar 29 15:26:58 2012 @@ -232,19 +232,20 @@ if(Abort()) return false; /* Progress step 1/9 */ - if (gui) ProgressNextStage(_("Detecting for ndiswrapper...")); + if (gui) ProgressNextStage(_("Detecting ndiswrapper...")); // modprobe ndiswrapper before hwinfo when needed (#343893) if (!Mode::autoinst() && PackageSystem::Installed("ndiswrapper")){ y2milestone("ndiswrapper: installed"); 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 a ndiswrapper configuration detected, -but the Kernel module was not modprobed. + && Popup::YesNo(_("Detected a ndiswrapper configuration, +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.")); + if (ModuleLoading::Load("ndiswrapper", "", "", "", false, true)==`fail) Popup::Error(_("ndiswrapper kernel module has not been loaded. +Check configuration manually. +")); } } } @@ -339,7 +340,7 @@ global void SetIPv6(boolean status){ if(ipv6 != status) { ipv6=status; - Popup::Warning(_("To apply this change a reboot is needed.")); + Popup::Warning(_("To apply this change, a reboot is needed.")); LanItems::SetModified(); } } @@ -505,7 +506,7 @@ `VSpacing(0.5), // This is in information message. Next come the // hardware class name (network cards). - `HVCenter(`Label(_("Because of bridged network YaST2 needs to restart network to apply the settings."))), + `HVCenter(`Label(_("Because of the bridged network, YaST2 needs to restart the network to apply the settings."))), `VSpacing(0.5) ))), `ButtonBox ( 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 Thu Mar 29 15:26:58 2012 @@ -505,7 +505,7 @@ } */ // NM doesn't ask for password (#225793) else if(ask_pass && NetworkService::IsManaged ()){ - Popup::Warning(_("NetworkManager does not have the ability to ask for the password. + Popup::Warning(_("NetworkManager cannot ask for the password. Use KInternet (without NetworkManager) or store passwords on the system. ")); continue; Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.yc… ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Thu Mar 29 15:26:58 2012 @@ -825,9 +825,11 @@ if (show_popup) { Popup::Warning( _("Network is currently controlled by NetworkManager and its settings -cannot be edited by YaST.\n -To edit the settings, use NetworkManager connection editor, or -switch the network setup method to Traditional method with ifup.")); +cannot be edited by YaST. + +To edit the settings, use the NetworkManager connection editor or +switch the network setup method to Traditional with ifup. +")); UI::FakeUserInput ($["ID": "global"]); } } else disable=false; 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 Thu Mar 29 15:26:58 2012 @@ -393,9 +393,10 @@ /* Proxy dialog help 5/8 */ - _("If you have the Use the Same Proxy for All Protocols option checked, it is + _("If you check Use the Same Proxy for All Protocols, it is enough to fill in the HTTP proxy URL. It will be used for all protocols -(HTTP, HTTPS and FTP).\n") + +(HTTP, HTTPS and FTP). +") + /* Proxy dialog help 6/8 */ @@ -408,7 +409,7 @@ /* Proxy dialog help 7/8 */ _("If you are using a proxy server with authorization, enter the Proxy User Name and Proxy Password. A valid username -consists of printable ASCII characters (except for quotation marks) only. +consists of printable ASCII characters only (except for quotation marks). ") + /* Proxy dialog help 8/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] r67786 - in /trunk/multipath/src: Multipath.ycp complex.ycp helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:25:07 2012 New Revision: 67786 URL: http://svn.opensuse.org/viewcvs/yast?rev=67786&view=rev Log: - merged proofread texts Modified: trunk/multipath/src/Multipath.ycp trunk/multipath/src/complex.ycp trunk/multipath/src/helps.ycp Modified: trunk/multipath/src/Multipath.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/src/Multipath.ycp?rev=… ============================================================================== --- trunk/multipath/src/Multipath.ycp (original) +++ trunk/multipath/src/Multipath.ycp Thu Mar 29 15:25:07 2012 @@ -107,31 +107,31 @@ ret = Read_MultipathConfig(); if(ret == false) { - Report::Error(_("Cannot read multipath section in multipath configuration")); + Report::Error(_("Cannot read multipath section in multipath configuration.")); return false; } ret = Read_DefaultsConfig(); if(ret == false) { - Report::Error(_("Cannot read defaults section in multipath configuration")); + Report::Error(_("Cannot read defaults section in multipath configuration.")); return false; } ret = Read_BlacklistConfig(); if(ret == false) { - Report::Error(_("Cannot read blacklist section in multipath configuration")); + Report::Error(_("Cannot read blacklist section in multipath configuration.")); return false; } ret = Read_BlacklistException_Config(); if(ret == false) { - Report::Error(_("Cannot read blacklist_exceptions section in multipath configuration")); + Report::Error(_("Cannot read blacklist_exceptions section in multipath configuration.")); return false; } ret = Read_DeviceConfig(); if(ret == false) { - Report::Error(_("Cannot read devices section in multipath configuration")); + Report::Error(_("Cannot read devices section in multipath configuration.")); return false; } return true; @@ -146,7 +146,7 @@ boolean ret = false; /* Multipath read dialog caption */ - string caption = _("Initializing multipath Configuration"); + string caption = _("Initializing Multipath Configuration"); integer steps = 4; @@ -180,7 +180,7 @@ if (Mode::normal() && Stage::normal()) { ret = PackageSystem::CheckAndInstallPackagesInteractive (required_pack_list); if (ret == false) { - Report::Error(_("Cannot install required packages")); + Report::Error(_("Cannot install required packages.")); return false; } } else { @@ -236,7 +236,7 @@ */ global boolean Write() { /* Multipath read dialog caption */ - string caption = _("Saving multipath Configuration"); + string caption = _("Saving Multipath Configuration"); integer steps = 2; @@ -280,7 +280,7 @@ if(service_status == 1) { if (Mode::normal() && Stage::normal()) { if( 0 != SCR::Execute(.target.bash, "/etc/init.d/multipathd restart")) { - Report::Error(_("Restart multipathd failed.")); + Report::Error(_("Restarting multipathd failed.")); return false; } } else { @@ -395,7 +395,7 @@ continue; } else if(ret == `start_multipath) { if (Modified() == true && - Popup::YesNo(_("Ignore your modification ?")) == false) + Popup::YesNo(_("Ignore your modification?")) == false) { Update_Service_Status(); continue; @@ -405,7 +405,7 @@ continue; } else if(ret == `stop_multipath) { if (Modified() == true && - Popup::YesNo(_("Ignore your modification ?")) == false) + Popup::YesNo(_("Ignore your modification?")) == false) { Update_Service_Status(); continue; Modified: trunk/multipath/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/src/complex.ycp?rev=67… ============================================================================== --- trunk/multipath/src/complex.ycp (original) +++ trunk/multipath/src/complex.ycp Thu Mar 29 15:25:07 2012 @@ -2721,7 +2721,7 @@ boolean ret = Service::Enable("boot.multipath"); if (ret == false) { - prop_info = prop_info + _("* Can not enable boot.multipath") + "\n"; + prop_info = prop_info + _("* Cannot enable boot.multipath.") + "\n"; Popup::Message(prop_info); Update_Service_Status(); return; @@ -2729,7 +2729,7 @@ ret = Service::Enable("multipathd"); if (ret == false) { - prop_info = prop_info + _("* Can not enable multipathd") + "\n"; + prop_info = prop_info + _("* Cannot enable multipathd.") + "\n"; Popup::Message(prop_info); Update_Service_Status(); return; @@ -2739,7 +2739,7 @@ ret = Service::Start("multipathd"); if (ret == false) { - prop_info = prop_info + _("* Can not start multipathd") + "\n"; + prop_info = prop_info + _("* Cannot start multipathd.") + "\n"; Popup::Message(prop_info); Update_Service_Status(); return; @@ -2764,7 +2764,7 @@ boolean ret = Service::Stop("multipathd"); if (ret == false) { - prop_info = prop_info + _("* Can not stop multipath") + "\n"; + prop_info = prop_info + _("* Cannot stop multipath.") + "\n"; Popup::Message(prop_info); Update_Service_Status(); return; @@ -2774,7 +2774,7 @@ ret = Service::Disable("multipathd"); if (ret == false) { - prop_info = prop_info + _("* Can not disable multipathd") + "\n"; + prop_info = prop_info + _("* Cannot disable multipathd.") + "\n"; Popup::Message(prop_info); Update_Service_Status(); return; @@ -2782,7 +2782,7 @@ ret = Service::Disable("boot.multipath"); if (ret == false) { - prop_info = prop_info + _("* Can not disable boot.multipath") + "\n"; + prop_info = prop_info + _("* Cannot disable boot.multipath.") + "\n"; Popup::Message(prop_info); Update_Service_Status(); return; Modified: trunk/multipath/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/src/helps.ycp?rev=6778… ============================================================================== --- trunk/multipath/src/helps.ycp (original) +++ trunk/multipath/src/helps.ycp Thu Mar 29 15:25:07 2012 @@ -37,13 +37,13 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<big>Initializing multipath Configuration</big> -Please wait... + "read" : _("<big>Initializing Multipath Configuration</big> + "), /* Write dialog help 1/2 */ - "write" : _("<big>Saving multipath Configuration</big> -Please wait... + "write" : _("<big>Saving Multipath Configuration</big> + "), /* dialog help for Status help */ -- 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] r67785 - in /trunk/mail: package/yast2-mail.changes src/mail-server_helps.ycp src/mail.ycp src/ui.ycp src/widgets.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:24:22 2012 New Revision: 67785 URL: http://svn.opensuse.org/viewcvs/yast?rev=67785&view=rev Log: - merged proofread texts Modified: trunk/mail/package/yast2-mail.changes trunk/mail/src/mail-server_helps.ycp trunk/mail/src/mail.ycp trunk/mail/src/ui.ycp trunk/mail/src/widgets.ycp Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Thu Mar 29 15:24:22 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:24:06 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Wed Jan 25 14:42:40 UTC 2012 - varkoly(a)suse.com - bnc#743369 - yast2 mail module does not open the firewall Modified: trunk/mail/src/mail-server_helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_helps.ycp?r… ============================================================================== --- trunk/mail/src/mail-server_helps.ycp (original) +++ trunk/mail/src/mail-server_helps.ycp Thu Mar 29 15:24:22 2012 @@ -25,7 +25,7 @@ /* Setup dialog help 1/1 */ "setup" : _("<big>Set Up Mail Server Configuration</big> -Please wait... + ") , /* Read dialog help 1/2 */ "read" : _("<big>Initializing Mail Server Configuration</big> @@ -85,18 +85,18 @@ ") + /* MailPrevention dialog help 2/3 */ _("<big>Start Virus Scanner AMAVIS:</big> -If you start the virus scanner AMAVIS, your e-mails will be scanned for viruses and and for spam. +If you start the virus scanner AMAVIS, your emails will be scanned for viruses and and for spam. The virus scanner engine Clamavd and the spam finder SpamAssassin will be installed -and configured too. You can also install other (commercial) virus scanner engines. +and configured as well. You can also install other (commercial) virus scanner engines. ") + /* MailPrevention dialog help 3/3 */ _("<big>Configure Spam Learning Extension:</big> The spam learning extension can only be configured if the local delivery method is cyrus imapd. -In this case the shared folders NewSpam and NoSpam will be created. Spam e-mail +In this case the shared folders NewSpam and NoSpam will be created. Spam email which was not detected by SpamAssassin should be put into the folder NewSpam. -If you want your spam finder to be most effective you should also put non spam e-mail into -the folder NoSpam. The e-mails in this folder cannot be read by anyone. +If you want your spam finder to be most effective you should also put non-spam email into +the folder NoSpam. The emails in this folder cannot be read by anyone. "), @@ -146,15 +146,15 @@ ") + /* MailLocalDomains dialog help 2/3 */ _("Note: You can create and set up the domains with the YaST -DNS server module. In this module, you only can set the properties +DNS server module. In the current module, you only can set the properties concerning the mail server. ")+ /* MailLocalDomains dialog help 3/3 */ _("<big>Type:</big> You can define virtual and local domains. In virtual domains, only users -assigned a mail address in the domain can receive mail. -In local domains, all user can get mails. Assign virtual mail +assigned an email address in the domain can receive emails. +In local domains, all users can get emails. Assign virtual email addresses in the YaST user module. "), Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=67785&r1=6… ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Thu Mar 29 15:24:22 2012 @@ -48,18 +48,18 @@ define string StartDialogHelp () ``{ return // Translators: start dialog help, part 1 of 4 - _("Email Server Configuration ") + + _("Mail Server Configuration ") + // Translators: start dialog help, part 2 of 4 _("This module will configure and start Postfix and, if necessary, the Cyrus IMAP server.")+ // Translators: start dialog help, part 3 of 4 _("Warning: Most home users can use the built-in -features of their e-mail application to send and -receive e-mail. They do not need this module. +features of their email application to send and +receive email. They do not need this module. ")+ // Translators: start dialog help, part 4 of 4 _("You need Postfix only to store -the e-mail on your local system, or for some special cases. +email on your local system or for some special cases. "); } @@ -68,11 +68,11 @@ y2milestone ("Mail configuration type %1", type); Wizard::SetScreenShotName ("mail-0-start"); - string caption = _("E-Mail Server Configuration"); + string caption = _("Mail Server Configuration"); term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in the future"))); string status = _("Mail server is not configured.")+"\n"+ - _("Select configuration type according your personal needs")+"\n"+ - _("If you want to use sendmail as your MTA you have to use Standard configuration.")+ + _("Select configuration type according your needs.")+"\n"+ + _("If you want to use sendmail as your MTA, you have to use the Standard configuration.")+ _("The Advanced configuration use LDAP as backend and will configure your system as LDAP-Client and setup an LDAP-Server if necessary."); if( first ) { Modified: trunk/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/ui.ycp?rev=67785&r1=677… ============================================================================== --- trunk/mail/src/ui.ycp (original) +++ trunk/mail/src/ui.ycp Thu Mar 29 15:24:22 2012 @@ -375,7 +375,7 @@ `VBox ( WJ_MakeWidget (`outgoing_mail_server), // TLS - `Label (_("The server use &TLS")), + `Label (_("The server uses &TLS.")), `RadioButtonGroup(`id(`TLS), `HBox( `Left(`RadioButton(`id("no"), _("No"), TLSnone)), Modified: trunk/mail/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/widgets.ycp?rev=67785&r… ============================================================================== --- trunk/mail/src/widgets.ycp (original) +++ trunk/mail/src/widgets.ycp Thu Mar 29 15:24:22 2012 @@ -763,8 +763,8 @@ // help text + _(" Enabling DKIM for outgoing emails requires additional actions. A SSL key -will be generated for the 'mydomain'-value defined in postfix. A new service -'submission' will be configured in postfix. After this is set up you can send +will be generated for the 'mydomain' value defined in Postfix. A new service +'submission' will be configured in Postfix. After this is set up you can send email with this service 'submission' from 'mynetworks' with enabled SASL authentication. Only the emails sent by this new service will be signed with the domain key. @@ -773,14 +773,14 @@ _(" The public key of the domain key needs to be offered by a Domain Name Service. The public key will be saved as a DNS TXT record -into /var/db/dkim/[mydomain].public.txt and needs to be deployed to an +in /var/db/dkim/[mydomain].public.txt and needs to be deployed to an according Domain Name Service. If there is a name service -running on this server, which is the authoritative server for that domain the +running on this server, which is the authoritative server for that domain, the public key will be added as a TXT record to that domain zone automatically. ") + // help text - _("Enabling DKIM support the virus scanning (AMaViS) will be enabled too."), + _("If you enable DKIM support, the virus scanning (AMaViS) will be enabled too."), "get": Get_use_dkim, "set": Set_use_dkim, ], -- 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] r67784 - in /trunk/live-installer: package/yast2-live-installer.changes src/inst_live_simple_proposal.ycp src/live-installer.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:23:51 2012 New Revision: 67784 URL: http://svn.opensuse.org/viewcvs/yast?rev=67784&view=rev Log: - merged proofread texts Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/inst_live_simple_proposal.ycp trunk/live-installer/src/live-installer.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Mar 29 15:23:51 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:23:27 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Tue Aug 30 14:43:52 CEST 2011 - jsrain(a)suse.cz - do not set the root device for mkinitrd explicitly (bnc#714650) Modified: trunk/live-installer/src/inst_live_simple_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_sim… ============================================================================== --- trunk/live-installer/src/inst_live_simple_proposal.ycp (original) +++ trunk/live-installer/src/inst_live_simple_proposal.ycp Thu Mar 29 15:23:51 2012 @@ -19,7 +19,7 @@ Wizard::SetContents ( // dialog caption - _("Installation settings"), + _("Installation Settings"), // label `Label (_("Analyzing the system...")), "", @@ -142,8 +142,9 @@ Use Accept to perform a new installation with the values displayed.") // help text 2/3 + _(" -To change the values click the respective headline -or select Change Installation Settings") +To change the values, click the respective headline +or select Change Installation Settings. +") // help text 3/3 + _(" Your hard disk has not been modified, you can still safely abort. @@ -152,7 +153,7 @@ Wizard::SetContents ( - _("Installation settings"), + _("Installation Settings"), contents, help, GetInstArgs::enable_back(), Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installe… ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Thu Mar 29 15:23:51 2012 @@ -44,7 +44,8 @@ if (! Popup::ContinueCancel (sformat (_("Your computer has less than %1 of memory. This may not be sufficient for the live installation, especially when installing while running other applications. -Before continuing, finish all running applications."), "1 GB"))) +Before continuing, close all running applications. +"), "1 GB"))) { UI::CloseDialog(); return nil; @@ -81,8 +82,9 @@ { // continue/cancel pop-up if (! Popup::ContinueCancel (_("YaST detected a mounted removable media. YaST cannot install -the system on media which is mounted. -To install the system on these media, unmount them first."))) +the system on mounted media. +Unmount the media to install the system on it. +"))) { Storage::SwitchUiAutomounter(true); UI::CloseDialog(); -- 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] r67783 - in /trunk/kerberos-server: package/yast2-kerberos-server.changes src/KerberosServer.pm src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:20:20 2012 New Revision: 67783 URL: http://svn.opensuse.org/viewcvs/yast?rev=67783&view=rev Log: - merged proofread texts Modified: trunk/kerberos-server/package/yast2-kerberos-server.changes trunk/kerberos-server/src/KerberosServer.pm trunk/kerberos-server/src/helps.ycp Modified: trunk/kerberos-server/package/yast2-kerberos-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/package/yast2-ke… ============================================================================== --- trunk/kerberos-server/package/yast2-kerberos-server.changes (original) +++ trunk/kerberos-server/package/yast2-kerberos-server.changes Thu Mar 29 15:20:20 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:20:06 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Mon Sep 26 11:26:40 CEST 2011 - visnov(a)suse.cz - Set dialog title and icon Modified: trunk/kerberos-server/src/KerberosServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/src/KerberosServ… ============================================================================== --- trunk/kerberos-server/src/KerberosServer.pm (original) +++ trunk/kerberos-server/src/KerberosServer.pm Thu Mar 29 15:20:20 2012 @@ -838,7 +838,7 @@ if(! -e "/usr/share/doc/packages/krb5/kerberos.schema") { y2error("Kerberos schema file not found"); - $errorMsg = _("Kerberos schema file not found"); + $errorMsg = _("Kerberos schema file not found."); $errorDetails = "/usr/share/doc/packages/krb5/kerberos.schema not found."; return 0; } @@ -1122,7 +1122,7 @@ my $pid = open3(\*IN, \*OUT, \*ERR, "/usr/lib/mit/sbin/kdb5_ldap_util", @cmdArgs) or do { y2error("Can not execute kdb5_ldap_util: $!"); - $errorMsg = _("Cannot execute kdb5_ldap_util ."); + $errorMsg = _("Cannot execute kdb5_ldap_util."); $errorDetails = "$!"; return 0; }; @@ -1170,7 +1170,7 @@ $pid = open3(\*IN, \*OUT, \*ERR, "/usr/lib/mit/sbin/kdb5_ldap_util", @cmdArgs) or do { y2error("Can not execute kdb5_ldap_util: $!"); - $errorMsg = _("Cannot execute kdb5_ldap_util ."); + $errorMsg = _("Cannot execute kdb5_ldap_util."); $errorDetails = "$!"; return 0; }; @@ -1219,7 +1219,7 @@ $pid = open3(\*IN, \*OUT, \*ERR, "/usr/lib/mit/sbin/kdb5_ldap_util", @cmdArgs) or do { y2error("Can not execute kdb5_ldap_util: $!"); - $errorMsg = _("Cannot execute kdb5_ldap_util ."); + $errorMsg = _("Cannot execute kdb5_ldap_util."); $errorDetails = "$!"; return 0; }; @@ -1962,7 +1962,7 @@ my $pid = open3(\*IN, \*OUT, \*ERR, "/usr/lib/mit/sbin/kdb5_ldap_util", @cmdArgs) or do { y2error("Cannot execute kdb5_ldap_util: $!"); - $errorMsg = _("Cannot execute kdb5_ldap_util ."); + $errorMsg = _("Cannot execute kdb5_ldap_util."); $errorDetails = "$!"; return 0; }; @@ -2129,7 +2129,7 @@ my $pid = open3(\*IN, \*OUT, \*ERR, "/usr/lib/mit/sbin/kdb5_util", @cmdArgs) or do { y2error("Can not execute kdb5_util: $!"); - $errorMsg = _("Cannot execute kdb5_util ."); + $errorMsg = _("Cannot execute kdb5_util."); $errorDetails = "$!"; return 0; }; @@ -2324,7 +2324,7 @@ # KerberosServer read dialog caption - my $caption = __("Initializing Kerberos server configuration"); + my $caption = __("Initializing Kerberos Server Configuration"); my $steps = 2; @@ -2421,7 +2421,7 @@ $errorDetails = ""; # KerberosServer read dialog caption - my $caption = __("Saving Kerberos server configuration"); + my $caption = __("Saving Kerberos Server Configuration"); my $steps = 2; Modified: trunk/kerberos-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/src/helps.ycp?re… ============================================================================== --- trunk/kerberos-server/src/helps.ycp (original) +++ trunk/kerberos-server/src/helps.ycp Thu Mar 29 15:20:20 2012 @@ -38,7 +38,7 @@ /* Read dialog help 1/2 */ "read" : _("<big>Initializing Kerberos Server Configuration</big> -Please wait... + ") + /* Read dialog help 2/2 */ @@ -48,7 +48,7 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving Kerberos Server Configuration</big> -Please wait... + ") + /* Write dialog help 2/2 */ @@ -58,7 +58,7 @@ "), /* Help text: ask for database backend 1/4 */ - "AskDBtype" : _("Here you specify where the Kerberos server should store the data.") + + "AskDBtype" : _("Specify where the Kerberos server should store the data.") + /* Help text: ask for database backend 2/4 */ _("<big>Local Database</big> will create a local database for storing the credentials.") + @@ -69,13 +69,13 @@ ") + /* Help text: ask for database backend 4/4 */ - _("<big>Use Existing LDAP Server as Database Back-End</big> gives you the possibility -to use an external LDAP server as database back-end. + _("<big>Use Existing LDAP Server as Database Back-End</big> gives you the +option to use an external LDAP server as database back-end. "), /* Help text: basic settings 1/2 */ - "basic" : _("Here you can specify the <big>Realm</big> and the <big>Master Password</big> for your Kerberos server.") + + "basic" : _("Specify the <big>Realm</big> and the <big>Master Password</big> for your Kerberos server.") + /* Help text: basic settings 2/2 */ _("Although your Kerberos realm can be any ASCII string, the convention is to use upper-case letters as in your domain name. @@ -86,7 +86,7 @@ "useldap" : _("In this dialog, edit some parameters for the LDAP server.") + /* Help text: Use existing LDAP server 2/6 */ - _("<big>LDAP Server URI</big> specify the location of the LDAP server.For example,<tt>ldaps://host.domain.com</tt> .") + + _("With <big>LDAP Server URI</big> specify the location of the LDAP\nserver. For example, <tt>ldaps://host.domain.com</tt>.") + /* Help text: Use existing LDAP server 3/6 */ _("With <big>LDAP Base DN</big> you can change the base DN of the LDAP server.") + @@ -144,7 +144,7 @@ "adv_database_name" : _("This string specifies the location of the Kerberos database for this realm."), /* advanced item help: acl_file*/ - "adv_acl_file" : _("This string specifies the location of the access control list (acl) file that kadmin uses to determine the principals' permissions on the database."), + "adv_acl_file" : _("This string specifies the location of the access control list (ACL) file that kadmin uses to determine the principals' permissions on the database."), /* advanced item help: admin_keytab */ "adv_admin_keytab" : _("This string specifies the location of the keytab file that kadmin uses to authenticate to the database."), @@ -242,7 +242,7 @@ "adv_ldap_conns_per_server" : _("This LDAP specific tag indicates the number of connections to be maintained via the LDAP server."), /* advanced item help : ldap_service_password_file*/ - "adv_ldap_service_password_file" : _("This LDAP specific tag indicates the file containing the stashed passwords for the objects used for starting the Kerberos servers."), + "adv_ldap_service_password_file" : _("This LDAP-specific tag indicates the file containing the stashed passwords for the objects used for starting the Kerberos servers."), /* advanced item help : kdb_subtrees*/ "adv_kdb_subtrees" : _("Specifies the list of subtrees containing the principals of a realm. The list contains the DNs of the subtree objects separated by colon(:).The search scope specifies the scope for searching the principals under the subtree."), -- 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] r67782 - /tags/stable-2_22_2/kerberos-client/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:19:25 2012 New Revision: 67782 URL: http://svn.opensuse.org/viewcvs/yast?rev=67782&view=rev Log: Created tag stable-2_22_2 for kerberos-client Added: tags/stable-2_22_2/kerberos-client/ - copied from r67781, trunk/kerberos-client/ -- 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] r67781 - in /trunk/kerberos-client: VERSION package/yast2-kerberos-client.changes src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:18:57 2012 New Revision: 67781 URL: http://svn.opensuse.org/viewcvs/yast?rev=67781&view=rev Log: - merged proofread texts Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/dialogs.ycp Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=6778… ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Thu Mar 29 15:18:57 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Thu Mar 29 15:18:57 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 15:18:30 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts +- 2.22.2 + +------------------------------------------------------------------- Fri Jan 13 11:53:33 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?… ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Thu Mar 29 15:18:57 2012 @@ -465,7 +465,7 @@ // checkbox label "label" : _("For&wardable"), // help text - "help" : _("Forwardable lets you transfer your complete identity (TGT) to another machine. Proxiable only lets you transfer particular tickets. Select if the options should be applied to all PAM services, none of them or enter a list of services separated by spaces."), + "help" : _("Forwardable lets you transfer your complete identity (TGT) to another machine. Proxiable only lets you transfer particular tickets. Select wheter the options should be applied to all PAM services, none of them or enter a list of services separated by spaces."), "init" : InitCombo, "store" : StoreDescription, "handle" : HandleDescription, @@ -496,7 +496,7 @@ // checkbox label "label" : _("Kerberos Support for Open&SSH Client"), // help text - "help" : _("To enable Kerberos support for your OpenSSH client, select Kerberos Support for OpenSSH Client. In such a case, Kerberos tickets are used for user authentication on the SSH server."), + "help" : _("To enable Kerberos support for your OpenSSH client, select Kerberos Support for OpenSSH Client. In this case, Kerberos tickets are used for user authentication on the SSH server."), "init" : InitCheckBox, "store" : StoreDescription, "handle" : HandleDescription, @@ -682,9 +682,9 @@ "widget" : `combobox, "opt" : [ `hstretch, `notify, `editable ], // textentry label - "label" : _("E&xternal credentials"), + "label" : _("E&xternal Credentials"), // help text - "help" : _("List the services allowed to provide credentials in External credentials."), + "help" : _("List the services allowed to provide credentials in External Credentials."), "init" : InitCombo, "store" : StoreDescription, "handle" : HandleDescription, -- 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] r67780 - in /trunk/kdump: package/yast2-kdump.changes src/dialogs.ycp src/helps.ycp src/kdump.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:18:11 2012 New Revision: 67780 URL: http://svn.opensuse.org/viewcvs/yast?rev=67780&view=rev Log: - merged proofread texts Modified: trunk/kdump/package/yast2-kdump.changes trunk/kdump/src/dialogs.ycp trunk/kdump/src/helps.ycp trunk/kdump/src/kdump.ycp Modified: trunk/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/package/yast2-kdump.change… ============================================================================== --- trunk/kdump/package/yast2-kdump.changes (original) +++ trunk/kdump/package/yast2-kdump.changes Thu Mar 29 15:18:11 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:17:59 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Thu Sep 29 11:48:29 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=67780&… ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Thu Mar 29 15:18:11 2012 @@ -362,7 +362,7 @@ ) ))), - `Frame ( _("Notification Email addresses"),`HBox(`HSpacing(1),`VBox( + `Frame ( _("Notification Email Addresses"),`HBox(`HSpacing(1),`VBox( `Left("NotificationTo"), `Left("NotificationCC") ))), @@ -387,7 +387,7 @@ `Left("KdumpCommandLineAppend") ))), `VSpacing(1), - `Frame ( _("Dumps Settings"),`HBox(`HSpacing(1),`VBox( + `Frame ( _("Dump Settings"),`HBox(`HSpacing(1),`VBox( `Left("EnableDeleteImages"), `Left("NumberDumps"), `Left("EnableReboot"), Modified: trunk/kdump/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/helps.ycp?rev=67780&r1… ============================================================================== --- trunk/kdump/src/helps.ycp (original) +++ trunk/kdump/src/helps.ycp Thu Mar 29 15:18:11 2012 @@ -39,7 +39,7 @@ /*Enable/Disable Kdump - RadioButtons 1/1*/ "StartRadioBut" : _("Enable/Disable Kdump Enable or disable kdump. The boot option crashkernel parameter is added/removed. - To apply changes a reboot is necessary. + To apply changes, a reboot is necessary. "), @@ -79,7 +79,9 @@ Server Name - The name of server. Port - The port number for connection. Directory on Server - The path for saving kdump images. - User Name for ssh connection. Password for ssh connection. ")+ + User Name for SSH connection. + Password for SSH connection. +")+ /* Dump Format - RadioButtons 5/6*/ _("NFS - Save kdump image on NFS. Server Name - The name of nfs server. @@ -104,9 +106,10 @@ /* Kdump Command Line Append - TextEntry 1/1*/ "KdumpCommandLineAppend" : _("Kdump Command Line Append - Setting this option means _append_ values to the default command line string. + Set this option to _append_ values to the default command line string. The string will be appended if the Kdump Command Line - is set. \n"), + is set. +"), /* Enable Immediate Reboot After Saving the Core - CheckBox 1/1*/ "EnableReboot" : _("Enable Immediate Reboot After Saving the Core - @@ -119,30 +122,34 @@ /*Enable Copy Ke&rnel into the Dump Directory - CheckBox 1/1*/ "EnableCopyKernel" : _("Enable Copy Kernel into the Dump Directory - - If it is selected the kernel itself and the - debugging information (if installed) gets copied into the dump - directory. The default is \"off\". It is useful have - everything in place for debugging. "), + If this option is selected, the kernel and the + debugging information (if installed) are copied into the dump + directory. The default is \"off\". It is useful to have + everything in place for debugging. +"), /* SMTP Server*/ - "SMTPServer" : _("SMTP Server used for sending a notification email after a dump has been taken."), + "SMTPServer" : _("SMTP Server used for sending a notification email after a dump."), /*SMTP User Name */ - "SMTPUser" : _("User Name for SMTP authetication when SMTP Server is set. This is optional, - without username/password, plain SMTP will be used."), + "SMTPUser" : _("User Name for SMTP authetication when SMTP Server is + set. This is optional. If you do not specifiy a username and password, plain SMTP will be used. +"), /*SMTP Password */ - "SMTPPassword": _("Password for SMTP authetication when SMTP Server is set. This is optional, - without username/password, plain SMTP will be used"), + "SMTPPassword": _("Password for SMTP authetication when SMTP Server is set. This + is optional. If you do not specify a username and password, plain SMTP will be used. +"), /* Notification To (email addresses) */ - "NotificationTo": _("Notification To mail address to which a notification mail will be sent when a dump has been - saved."), + "NotificationTo": _("Notification To Specify the email address to which a notification email will be sent when a dump has been saved. +"), /* Notification CC (email addresses) */ - "NotificationCC": _("Notification CC is list of space-separated mail addresses to which notification mail will be - sent via Cc if a dump has been saved."), + "NotificationCC": _("Notification CC Specify a list of space-separated email addresses to + which a notification email will be sent via cc if a dump has been saved. +"), /* Number of Old Dumps (number) */ "NumberDumps" : _("Number of Old Dumps specifies how many old dumps are kept. If the number of dump files Modified: trunk/kdump/src/kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump.ycp?rev=67780&r1… ============================================================================== --- trunk/kdump/src/kdump.ycp (original) +++ trunk/kdump/src/kdump.ycp Thu Mar 29 15:18:11 2012 @@ -584,7 +584,7 @@ return true; } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong value of options \"server\".")); + CommandLine::Error(_("Wrong value for option \"server\".")); return false; } @@ -605,7 +605,7 @@ return true; } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong value of options \"user\".")); + CommandLine::Error(_("Wrong value for option \"user\".")); return false; } @@ -642,7 +642,7 @@ return true; } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong value of options \"email\".")); + CommandLine::Error(_("Wrong value for option \"email\".")); return false; } @@ -663,7 +663,7 @@ return true; } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong value of options \"email\".")); + CommandLine::Error(_("Wrong value for option \"email\".")); return false; } @@ -794,7 +794,7 @@ "smtpserver": $[ "handler" : cmdKdumpSMTPServer, // TRANSLATORS: CommandLine help - "help" : _("SMTP Server for sending notification messages."), + "help" : _("SMTP server for sending notification messages."), "example" : [ "smtpserver server=smtp.server.com", ], @@ -803,7 +803,7 @@ "smtpuser": $[ "handler" : cmdKdumpSMTPUser, // TRANSLATORS: CommandLine help - "help" : _("SMTP Username for sending notification messages."), + "help" : _("SMTP username for sending notification messages."), "example" : [ "smtpuser user=foo_user", ], @@ -812,7 +812,7 @@ "smtppass": $[ "handler" : cmdKdumpSMTPPass, // TRANSLATORS: CommandLine help - "help" : _("SMTP Password for sending notification messages. Path of file which includes password (plain text file)"), + "help" : _("SMTP password for sending notification messages. Path of file which includes password (plain text file)."), "example" : [ "smtppass pass=/path/to/file", ], -- 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] r67779 - in /trunk/isns: package/yast2-isns.changes src/helps.ycp src/widgets.ycp src/wizards.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:17:35 2012 New Revision: 67779 URL: http://svn.opensuse.org/viewcvs/yast?rev=67779&view=rev Log: - merged proofread texts Modified: trunk/isns/package/yast2-isns.changes trunk/isns/src/helps.ycp trunk/isns/src/widgets.ycp trunk/isns/src/wizards.ycp Modified: trunk/isns/package/yast2-isns.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/package/yast2-isns.changes?… ============================================================================== --- trunk/isns/package/yast2-isns.changes (original) +++ trunk/isns/package/yast2-isns.changes Thu Mar 29 15:17:35 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:17:08 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Thu Sep 29 11:25:22 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/isns/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/helps.ycp?rev=67779&r1=… ============================================================================== --- trunk/isns/src/helps.ycp (original) +++ trunk/isns/src/helps.ycp Thu Mar 29 15:17:35 2012 @@ -18,7 +18,7 @@ /* Read dialog help 1/2 */ "read" : _("<big>Initializing iSNS daemon configuration</big> -Please wait... + ") + /* Read dialog help 2/2 */ @@ -28,7 +28,7 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving iSNS Configuration</big> -Please wait... + ") + /* Write dialog help 2/2 */ @@ -40,28 +40,22 @@ /* Summary dialog help 1/3 */ "summary" : _("<big>iSNS Configuration</big> -Configure an iSNS server here. +Configure an iSNS server. "), - "ipaddress" : _("<big>iSNS Server location</big> The DNS name or the ip address of the iSNS service can be entered for the iSNS address. -"), + "ipaddress" : _("<big>iSNS Server location</big> The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n"), - "iscsi_display" : _( -"The list of all available iSCSI nodes registered with the iSNS service are displayed. Nodes are registered by iSCSI initiators and iSCSI targets. It is only possible to delete them. Deleting a node removes it from the iSNS database."), + "iscsi_display" : _("The list of all available iSCSI nodes registered with the iSNS service are displayed. Nodes are registered by iSCSI initiators and iSCSI targets. It is only possible to delete them. Deleting a node removes it from the iSNS database."), // discovery domains - "dd_display" : _( -"A list of all discovery domains are displayed. For discovery domains, it is possible to Create a discovery domain and Delete them. Deleting a domain removes the members from the domain but does not delete the iSCSI node members "), + "dd_display" : _("A list of all discovery domains is displayed. It is possible to Create a discovery domain or Delete one. Deleting a domain removes the members from the domain but does not delete the iSCSI node members."), - "dd_display_members" :_( -"A list of all iSCSI nodes are displayed by discovery domain. Selecting another discovery domain refreshes the list with members from that discovery domain. It is possible to Add an iSCSI node to a discovery domain or Delete the node. Deleting a node removes it from the domain but does not delete the iSCSI node Creating an iSCSI node allows a not yet registered node to be added as a member of the discovery domain. When the initiator or target registers this node then it becomes part of this domain When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains. "), + "dd_display_members" :_("A list of all iSCSI nodes are displayed by discovery domain. Selecting another discovery domain refreshes the list with members from that discovery domain. It is possible to Add an iSCSI node to a discovery domain or Delete the node. Deleting a node removes it from the domain but does not delete the iSCSI node Creating an iSCSI node allows a not yet registered node to be added as a member of the discovery domain. When the initiator or target registers this node then it becomes part of this domain When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains. "), // dds table dialog - "dds_display" :_( -"At the top a list of all Discovery Domain Sets are displayed. Discovery Domains belong to Discovery Domain Sets. A Discovery Domain must be a member of a Discovery Domain Set in order to be active. In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members." ), + "dds_display" :_("At the top a list of all Discovery Domain Sets are displayed. Discovery Domains belong to Discovery Domain Sets. A Discovery Domain must be a member of a Discovery Domain Set in order to be active. In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members."), - "dds_display_members" :_( -"The Discovery Domain Set Members list is refreshed whenever a different Discovery Domain Set is selected." ), + "dds_display_members" :_("The discovery domain set members list is refreshed whenever a different discovery domain set is selected."), ]; Modified: trunk/isns/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/widgets.ycp?rev=67779&r… ============================================================================== --- trunk/isns/src/widgets.ycp (original) +++ trunk/isns/src/widgets.ycp Thu Mar 29 15:17:35 2012 @@ -24,12 +24,12 @@ `VBox( `Heading(_("Create New Discovery Domain")), `HSpacing(50), - `HWeight(3,`InputField( `id( `ddentry ), `opt(`hstretch), _("Discovery Domain Name" ))) , + `HWeight(3,`InputField( `id( `ddentry ), `opt(`hstretch), _("Discovery Domain Name"))) , `VSpacing(1), `HBox( `HSpacing(3), `VBox( - `Label(_("Select Discovery Domain Set to which Discovery Domain will be added.")), + `Label(_("Select discovery domain set to which discovery domain will be added.")), `SelectionBox( `id( `ddsentries), _("Discovery Domain Name Set") ) ), `HSpacing(3) @@ -166,7 +166,7 @@ map <string, any> ret_map = $[]; term iscsi_member_dialog = `VBox( - `Heading(_("Add iSCSI node to Discovery Domain")), + `Heading(_("Add iSCSI node to discovery domain")), `Label(dd_name), `HSpacing(100), `Heading (_("Available Nodes to Add")), @@ -617,7 +617,7 @@ { // boolean display = true; // Report::DisplayErrors(display,10); - Report::Error(_("Unable to connection to iSNS server. Check iSNS server address")); + Report::Error(_("Unable to connect to iSNS server. Check iSNS server address.")); return 1; } Modified: trunk/isns/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/wizards.ycp?rev=67779&r… ============================================================================== --- trunk/isns/src/wizards.ycp (original) +++ trunk/isns/src/wizards.ycp Thu Mar 29 15:17:35 2012 @@ -88,7 +88,7 @@ any IsnsServerAutoSequence() { /* Initialization dialog caption */ - string caption = _("isns daemon configuration"); + string caption = _("isns Daemon Configuration"); /* Initialization dialog contents */ term contents = `Label(_("Initializing...")); -- 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] r67778 - in /trunk/iscsi-server: package/yast2-iscsi-server.changes src/IscsiServer.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:16:42 2012 New Revision: 67778 URL: http://svn.opensuse.org/viewcvs/yast?rev=67778&view=rev Log: - merged proofread texts Modified: trunk/iscsi-server/package/yast2-iscsi-server.changes trunk/iscsi-server/src/IscsiServer.ycp trunk/iscsi-server/src/helps.ycp Modified: trunk/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-server/package/yast2-iscsi-server.changes (original) +++ trunk/iscsi-server/package/yast2-iscsi-server.changes Thu Mar 29 15:16:42 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:16:10 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts + +------------------------------------------------------------------- Tue Sep 27 15:19:42 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/iscsi-server/src/IscsiServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/IscsiServer.ycp… ============================================================================== --- trunk/iscsi-server/src/IscsiServer.ycp (original) +++ trunk/iscsi-server/src/IscsiServer.ycp Thu Mar 29 15:16:42 2012 @@ -130,7 +130,7 @@ if (!PackageSystem::PackageInstalled("iscsitarget")){ y2milestone("Not installed, will install"); boolean confirm = Popup::AnyQuestionRichText( - "", _("Can't continue without installing iscsitarget package"), 40, 10, + "", _("Cannot continue without installing iscsitarget package."), 40, 10, Label::InstallButton(), Label::CancelButton (), `focus_yes ); @@ -179,8 +179,8 @@ boolean reloadServer(){ // ask user whether reload or restart server // #180205 - gettext problem - string wasn't marked to translate -if (Popup::YesNo(_( "If changes have been made, the iSCSI target is not able -to reload current configuration. It can only restart. +if (Popup::YesNo(_("If changes have been made, the iSCSI target is not able +to reload the current configuration. It can only restart. When restarting, all sessions are aborted. Restart the iscsitarget service? "))) Service::Restart("iscsitarget"); Modified: trunk/iscsi-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/helps.ycp?rev=6… ============================================================================== --- trunk/iscsi-server/src/helps.ycp (original) +++ trunk/iscsi-server/src/helps.ycp Thu Mar 29 15:16:42 2012 @@ -98,26 +98,24 @@ "), // discovery authentication - "global_config" : _( -"Select the type of authentication. Use No Authentication or one of Incoming and Outgoing (can be both together). Then insert User and Password.\n" + "global_config" : _("Select the type of authentication. Use No Authentication or one of Incoming and Outgoing (can be both together). Then insert User and Password.\n" "For incoming authentication, it is possible to Add more pairs or Edit or Delete them."), // target dialog - "server_table" :_( -"List of offered targets. Create a new target by clicking Add. \n" -"To delete or modify an item, select it and press Modify or Delete." -), + "server_table" :_("List of offered targets. Create a new target by clicking Add. \n" +"To delete or modify an item, select it and press Modify or Delete."), // edit target "target-modify": _("<h1>iSCSI Target</h1>") + _("It is possible to change the Path to block devices, regular files, LVM, or RAID. "), // add target - "target-add": _("<h1>iSCSI Target</h1>") + _( -"Create a new target. Replace template values with the correct values.\n" + "target-add": _("<h1>iSCSI Target</h1>") + _("Create a new target. Replace template values with the correct values.\n" "For Target, use the format iqn.yyyy-mm.<reversed domain name>.\n" "For Path, use block devices, regular files, LVM, or RAID.\n") -+_("Add one or more LUNs.\nIf you need any extra options, push Expert Settings."), ++_("Add one or more LUNs. +If you need additional options, click Expert Settings. +"), // expert dialog -- 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] r67777 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClient.ycp src/IscsiClientLib.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:15:57 2012 New Revision: 67777 URL: http://svn.opensuse.org/viewcvs/yast?rev=67777&view=rev Log: - merged proofed texts Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClient.ycp trunk/iscsi-client/src/IscsiClientLib.ycp trunk/iscsi-client/src/helps.ycp Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu Mar 29 15:15:57 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:15:41 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts + +------------------------------------------------------------------- Wed Feb 15 11:36:05 CET 2012 - fehr(a)suse.de - version 2.22.0 Modified: trunk/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp… ============================================================================== --- trunk/iscsi-client/src/IscsiClient.ycp (original) +++ trunk/iscsi-client/src/IscsiClient.ycp Thu Mar 29 15:15:57 2012 @@ -229,7 +229,7 @@ list<string> descr = [ /* Progress stage 1/2 */ - _("Write the autoYaST settings"), + _("Write AutoYaST settings"), /* Progress stage 2/2 */ _("Set up service status") ]; Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Mar 29 15:15:57 2012 @@ -383,9 +383,11 @@ y2milestone("checkInitiatorName initiatorname=%1", initiatorname); if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { - Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. -The old initiatorname will be replaced by the value of iBFT and create a backup. -If you want to use a different initiatorname, change it in the BIOS.") ); + Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> +differ. The old initiator name will be replaced by the value of iBFT and a +backup created. If you want to use a different initiator name, change it +in the BIOS. +") ); y2milestone("replacing old name %1 by name %2 from iBFT", initiatorname, name_from_bios); initiatorname = name_from_bios; ret = writeInitiatorName(initiatorname); Modified: trunk/iscsi-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/helps.ycp?rev=6… ============================================================================== --- trunk/iscsi-client/src/helps.ycp (original) +++ trunk/iscsi-client/src/helps.ycp Thu Mar 29 15:15:57 2012 @@ -103,11 +103,13 @@ // authentification dialog for add/discovery target "conn_auth" : _("<h1>iSCSI Initiator</h1>") +_("Select the type of authentication and enter the Username and Password.") + - _("<h1>Startup</h1>") + _("manual is for iSCSI targets to not be connected by default, user needs to do it manually -onboot is for iSCSI targets to be connected during boot, ie when root is on -iSCSI. As such it will be evaluated from the initrd. -automatic is for iSCSI targets to be connected when the iSCSI service itself -starts up."), + _("<h1>Startup</h1>") + _("manual is for iSCSI targets which are not to be connected by +default, the user needs to connect them manually +onboot is for iSCSI targets to be connected during boot, i.e. when +root is on iSCSI. As such it will be evaluated by the initrd. +automatic is for iSCSI targets to be connected when the iSCSI service +starts up. +"), // list of discovered targets "discovered" : _("List of discovered targets. Start a new Discovery or Connect to any target."), -- 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] r67776 - in /trunk/instserver: package/yast2-instserver.changes src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:14:53 2012 New Revision: 67776 URL: http://svn.opensuse.org/viewcvs/yast?rev=67776&view=rev Log: - merged proofed texts Modified: trunk/instserver/package/yast2-instserver.changes trunk/instserver/src/helps.ycp Modified: trunk/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/package/yast2-instser… ============================================================================== --- trunk/instserver/package/yast2-instserver.changes (original) +++ trunk/instserver/package/yast2-instserver.changes Thu Mar 29 15:14:53 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:14:36 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts + +------------------------------------------------------------------- Thu Sep 29 11:22:06 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/instserver/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/helps.ycp?rev=677… ============================================================================== --- trunk/instserver/src/helps.ycp (original) +++ trunk/instserver/src/helps.ycp Thu Mar 29 15:14:53 2012 @@ -129,7 +129,7 @@ /* Write dialog help 1/2 */ "write" : _("Saving Repository Configuration -Please wait... + ") + /* Write dialog help 2/2 */ @@ -159,8 +159,8 @@ /* Ovreview dialog help 1/3 */ "overview" : _("Repositories Overview -Here you get an overview of the configured repositories. Additionally, -you are able to edit their configuration. +Get an overview of the configured repositories and edit their +configuration if necessary. ") + /* Ovreview dialog help 2/3 */ -- 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] r67775 - in /trunk/inetd: package/yast2-inetd.changes src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:14:06 2012 New Revision: 67775 URL: http://svn.opensuse.org/viewcvs/yast?rev=67775&view=rev Log: - merged proofed texts Modified: trunk/inetd/package/yast2-inetd.changes trunk/inetd/src/dialogs.ycp Modified: trunk/inetd/package/yast2-inetd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/package/yast2-inetd.change… ============================================================================== --- trunk/inetd/package/yast2-inetd.changes (original) +++ trunk/inetd/package/yast2-inetd.changes Thu Mar 29 15:14:06 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:13:50 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts + +------------------------------------------------------------------- Mon Sep 26 15:35:58 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/inetd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/dialogs.ycp?rev=67775&… ============================================================================== --- trunk/inetd/src/dialogs.ycp (original) +++ trunk/inetd/src/dialogs.ycp Thu Mar 29 15:14:06 2012 @@ -875,7 +875,7 @@ input_failed = true; } else if (service_name != nil && search (service_name, "/") != nil) { /* Error message */ - Popup::Message (_("Service name contains disallowed character \"/\"")); + Popup::Message (_("Service name contains disallowed character \"/\".")); input_failed = true; } else if ((UI::QueryWidget(`id(`server), `Value) != "") && (UI::QueryWidget(`id(`user), `Value) == _("--default--"))) -- 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] r67774 - /tags/stable-2_22_0/http-server/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:12:49 2012 New Revision: 67774 URL: http://svn.opensuse.org/viewcvs/yast?rev=67774&view=rev Log: Created tag stable-2_22_0 for http-server Added: tags/stable-2_22_0/http-server/ - copied from r67773, trunk/http-server/ -- 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] r67773 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/YaPI/HTTPD.pm src/helps.ycp yast2-http-server.spec.in
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:12:28 2012 New Revision: 67773 URL: http://svn.opensuse.org/viewcvs/yast?rev=67773&view=rev Log: - merged proofed texts - confirmed license - 2.22.0 Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/YaPI/HTTPD.pm trunk/http-server/src/helps.ycp trunk/http-server/yast2-http-server.spec.in Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=67773&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Thu Mar 29 15:12:28 2012 @@ -1 +1 @@ -2.21.0 +2.22.0 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Thu Mar 29 15:12:28 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 29 15:11:25 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Thu Sep 29 11:08:59 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/YaPI/HTTPD.pm?re… ============================================================================== --- trunk/http-server/src/YaPI/HTTPD.pm (original) +++ trunk/http-server/src/YaPI/HTTPD.pm Thu Mar 29 15:12:28 2012 @@ -676,7 +676,7 @@ } elsif( $hostid ne 'default' and $tmp->{KEY} =~ /ServerTokens|TimeOut|ExtendedStatus/ ) { # illegal keys in vhost - return $self->SetError( summary => sprintf( __("Illegal key in vhost '%s'."),$tmp->{KEY}), + return $self->SetError( summary => sprintf( __("Illegal key in virtual host '%s'."),$tmp->{KEY}), code => "CHECK_PARAM_FAILED" ); } else { push( @tmp, $tmp ); @@ -759,7 +759,7 @@ } if( $key->{KEY} =~ /ServerTokens|TimeOut|ExtendedStatus/ ) { # illegal keys in vhost - return $self->SetError( summary => sprintf(__("Illegal key in vhost '%s'."), $key->{KEY}), + return $self->SetError( summary => sprintf(__("Illegal key in virtual host '%s'."), $key->{KEY}), code => "CHECK_PARAM_FAILED" ); } else { push( @tmp, $key ); Modified: trunk/http-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/helps.ycp?rev=67… ============================================================================== --- trunk/http-server/src/helps.ycp (original) +++ trunk/http-server/src/helps.ycp Thu Mar 29 15:12:28 2012 @@ -178,12 +178,13 @@ + _("<big>Server Resolution</big> Apache2 must be able to determine which virtual host settings it should use to create a response for an HTTP request. -In principle, there are two basic approaches. If using HTTP headers +There are two basic approaches. If using HTTP headers from the incoming request, the server looks up the host name specified by the HTTP request headers. The other possibility is to determine the virtual host by the IP address used by the client when connecting to the server. -If you plan to configure SSL based vhost, use Resolution via IP address -Consult the Apache2 manual for further details.\n"), +If you plan to configure SSL-based vhost, use Resolution via IP address +Consult the Apache2 manual for further details. +"), // advanced new host dialog 1/5 "set_vhost" : _("<big>Details for New Host</big> This dialog allows you to specify additional information about a new virtual host.") @@ -191,8 +192,11 @@ +_("Select Enable CGI Support to run CGI scripts in the path in CGI Directory Path using the alias <tt>/cgi-bin/</tt>.") // advanced new host dialog 3/5 - +_("For HTTPS access to this virtual host, select Enable SSL Support.\n -Then enter the path for the certificate file in Certificate File Path.This option is available only for IP based vhosts.") + +_("For HTTPS access to this virtual host, select Enable SSL Support. + +Then enter the path for the certificate file in Certificate File +Path.This option is only available for IP-based vhosts. +") // advanced new host dialog 4/5 +_("In Directory Index, enter a space-separated list of files that Apache should look for and provide when a URL for a directory (one that ends in <tt>/</tt>) is requested. The first matching file found is provided.") // advanced new host dialog 5/5 Modified: trunk/http-server/yast2-http-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/yast2-http-server.sp… ============================================================================== --- trunk/http-server/yast2-http-server.spec.in (original) +++ trunk/http-server/yast2-http-server.spec.in Thu Mar 29 15:12:28 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: yast2-network docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libzio Requires: yast2-network yast2-perl-bindings libzio # DnsServerApi moved to yast2.rpm (bnc#392606) -- 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] r67772 - in /trunk/heartbeat: package/yast2-heartbeat.changes src/heartbeat.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:11:05 2012 New Revision: 67772 URL: http://svn.opensuse.org/viewcvs/yast?rev=67772&view=rev Log: - merged proofed texts Modified: trunk/heartbeat/package/yast2-heartbeat.changes trunk/heartbeat/src/heartbeat.ycp trunk/heartbeat/src/helps.ycp Modified: trunk/heartbeat/package/yast2-heartbeat.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/package/yast2-heartbea… ============================================================================== --- trunk/heartbeat/package/yast2-heartbeat.changes (original) +++ trunk/heartbeat/package/yast2-heartbeat.changes Thu Mar 29 15:11:05 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:09:38 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts + +------------------------------------------------------------------- Thu Sep 29 10:51:55 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/heartbeat/src/heartbeat.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/heartbeat.ycp?rev=… ============================================================================== --- trunk/heartbeat/src/heartbeat.ycp (original) +++ trunk/heartbeat/src/heartbeat.ycp Thu Mar 29 15:11:05 2012 @@ -39,7 +39,7 @@ "node" : $[ "handler" : NodeHandler, // translators: command line help text for add action - "help" : _("Configure a list of the servers for the cluster"), + "help" : _("Configure a list of servers for the cluster."), ], "medium" : $[ "handler" : MediumHandler, @@ -78,7 +78,7 @@ ], "type" : $[ // translators: command line help text for the 'play' option - "help" : _("Communication mode, can be 'bcast' for broadcast or 'mcast' for multicast."), + "help" : _("Set the communication mode to 'bcast' for broadcast or 'mcast' for multicast."), "type" : "string" ], "device" : $[ @@ -103,7 +103,7 @@ ], "method" : $[ // translators: command line help text for the 'play' option - "help" : _("Authentication method, can be 'crc' (no security), 'sha1' or 'md5'."), + "help" : _("Set authentication method to 'crc' (no security), 'sha1' or 'md5'."), "type" : "string" ], "key" : $[ Modified: trunk/heartbeat/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/helps.ycp?rev=6777… ============================================================================== --- trunk/heartbeat/src/helps.ycp (original) +++ trunk/heartbeat/src/helps.ycp Thu Mar 29 15:11:05 2012 @@ -157,9 +157,10 @@ is booted. You can start the Heartbeat server manually using the <tt>/etc/init.d/heartbeat start</tt> command. To propagate the configuration to all nodes of the cluster and -to enable heartbeat service on them, run the commandline utility +to enable heartbeat service on them, run the command line utility <tt>/usr/lib/heartbeat/ha_propagate</tt> on this node after the -configuration is saved."), +configuration is saved. +"), "timeouts_conf": _("Heartbeat uses a variety of timers to tune and configure its behavior. All timers are specified in seconds. -- 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] r67771 - /tags/stable-2_22_0/ftp-server/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 15:00:09 2012 New Revision: 67771 URL: http://svn.opensuse.org/viewcvs/yast?rev=67771&view=rev Log: Created tag stable-2_22_0 for ftp-server Added: tags/stable-2_22_0/ftp-server/ - copied from r67770, trunk/ftp-server/ -- 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] r67770 - in /trunk/ftp-server: ./ package/ src/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:59:26 2012 New Revision: 67770 URL: http://svn.opensuse.org/viewcvs/yast?rev=67770&view=rev Log: - merged proofed texts - confirmed license - 2.22.0 Modified: trunk/ftp-server/VERSION trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/complex.ycp trunk/ftp-server/src/dialogs.ycp trunk/ftp-server/src/ftp-server.ycp trunk/ftp-server/src/helps.ycp trunk/ftp-server/src/wid_functions.ycp trunk/ftp-server/yast2-ftp-server.spec.in Modified: trunk/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/VERSION?rev=67770&r1=… ============================================================================== --- trunk/ftp-server/VERSION (original) +++ trunk/ftp-server/VERSION Thu Mar 29 14:59:26 2012 @@ -1 +1 @@ -2.21.1 +2.22.0 Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Thu Mar 29 14:59:26 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 29 14:56:18 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Mon Sep 26 11:15:43 CEST 2011 - visnov(a)suse.cz - Set dialog title Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev… ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Thu Mar 29 14:59:26 2012 @@ -890,8 +890,8 @@ if ((vsftpd_installed)&&(pureftpd_installed)) { if (CommandLine::Interactive()) { CommandLine::Print(String::UnderlinedHeader(_("You have installed both daemons:"), 0)); - CommandLine::Print(_("Please choose one of them for configuration.")); - CommandLine::Print(_("Do you want to configure vsftpd? Alternatively choose pure-ftpd")); + CommandLine::Print(_("Choose one of them for configuration.")); + CommandLine::Print(_("Do you want to configure vsftpd? Alternatively choose pure-ftpd.")); CommandLine::Print(""); if (CommandLine::YesNo()) vsftpd_edit = true; @@ -980,7 +980,7 @@ if (PollAbort()) return false; Progress::NextStage (); // write settings for starting daemon - if (!WriteUpload ()) Report::Error (_("Cannot create upload directory for anonymous connections!")); + if (!WriteUpload ()) Report::Error (_("Cannot create upload directory for anonymous connections.")); sleep(sl); Modified: trunk/ftp-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/complex.ycp?rev=6… ============================================================================== --- trunk/ftp-server/src/complex.ycp (original) +++ trunk/ftp-server/src/complex.ycp Thu Mar 29 14:59:26 2012 @@ -79,9 +79,9 @@ UI::OpenDialog( `RadioButtonGroup(`id("IntstallFTPd"), `VBox( - `Heading (_("No server package installed")), - `Left(`Label(_("Please choose an ftp daemon."))), - `Left(`Label(_("Press Cancel to cancel the configuration of the ftp."))), + `Heading (_("No server package installed.")), + `Left(`Label(_("Choose an FTP daemon."))), + `Left(`Label(_("Press Cancel to cancel FTP configuration."))), `Left(`RadioButton(`id(0), `opt(`notify), _("&vsftpd"), true)), `Left(`RadioButton(`id(1), `opt(`notify), _("&pure-ftpd"))), `HBox( @@ -142,11 +142,11 @@ vsftpd_init_count = vsftpd_init_count + 1; } } else if (result == false) { - Popup::Error(_("Package for ftp is not available.")); + Popup::Error(_("Package for FTP is not available.")); y2milestone("[ftp-server] Package for ftp is not available"); return false; } else if (result == nil) { - Popup::Error(_("Package not found")); + Popup::Error(_("Package not found.")); y2milestone("[ftp-server] Package was not found"); return false; } Modified: trunk/ftp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/dialogs.ycp?rev=6… ============================================================================== --- trunk/ftp-server/src/dialogs.ycp (original) +++ trunk/ftp-server/src/dialogs.ycp Thu Mar 29 14:59:26 2012 @@ -75,8 +75,8 @@ map<string,any> StartStop () { map<string,any> result = $[]; result["service_id"] = "vsftpd"; - result["service_running_label"] = _("ftp is running"); - result["service_not_running_label"] = _("ftp is not running"); + result["service_running_label"] = _("FTP is running"); + result["service_not_running_label"] = _("FTP is not running"); result["start_now_button"] = _("&Start FTP Now"); result["stop_now_button"] = _("S&top FTP Now"); result["save_now_action"] = SaveAndRestartVsftpd; @@ -85,11 +85,11 @@ result["stop_now_action"] = StopNowVsftpd; result["help"] = sformat (CWMServiceStart::StartStopHelpTemplate (true), // part of help text - push button label, NO SHORTCUT!!! - _("Start FTP daemon Now"), + _("Start FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Stop FTP daemon Now"), + _("Stop FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Save Settings and Restart FTP daemon Now")); + _("Save Settings and Restart FTP Daemon Now")); return result; } @@ -104,8 +104,8 @@ map<string,any> StartStopPure () { map<string,any> result = $[]; result["service_id"] = "pure-ftpd"; - result["service_running_label"] = _("ftp is running"); - result["service_not_running_label"] = _("ftp is not running"); + result["service_running_label"] = _("FTP is running"); + result["service_not_running_label"] = _("FTP is not running"); result["start_now_button"] = _("&Start FTP Now"); result["stop_now_button"] = _("S&top FTP Now"); result["save_now_action"] = SaveAndRestartPure; @@ -114,11 +114,11 @@ result["stop_now_action"] = StopNowPure; result["help"] = sformat (CWMServiceStart::StartStopHelpTemplate (true), // part of help text - push button label, NO SHORTCUT!!! - _("Start FTP daemon Now"), + _("Start FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Stop FTP daemon Now"), + _("Stop FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Save Settings and Restart FTP daemon Now")); + _("Save Settings and Restart FTP Daemon Now")); return result; } @@ -319,7 +319,7 @@ map<string,any> FtpDirAnon () { map<string,any> result = $[]; - result["label"] = _("Ftp Directory for Anon&ymous Users"); + result["label"] = _("FTP Directory for Anon&ymous Users"); result["widget"] = `textentry; result["opt"] = [`notify]; result["init"] = InitFtpDirAnon; @@ -364,7 +364,7 @@ map<string,any> FtpDirLocal () { map<string,any> result = $[]; - result["label"] = _("&Ftp Directory for Authenticated Users"); + result["label"] = _("&FTP Directory for Authenticated Users"); result["widget"] = `textentry; result["opt"] = [`notify]; result["init"] = InitFtpDirLocal; @@ -798,7 +798,7 @@ map<string,any> CertFile () { map<string,any> result = $[]; - result["label"] = _("D&SA Certificate to Use for SSL Encrypted Connections"); + result["label"] = _("D&SA Certificate to Use for SSL-encrypted Connections"); result["widget"] = `textentry; result["init"] = InitCertFile; result["validate_type"] = `function; @@ -908,7 +908,7 @@ `VStretch () ); // TRANSLATORS: part of dialog caption - result["caption"] = _("FTP Start-Up"); + result["caption"] = _("FTP Start-up"); // TRANSLATORS: tree menu item result["tree_item_label"] = _("Start-Up"); result["widget_names"] = ["StartMode", "StartStop", "RBVsPureFTPd", "StartStopRestart"]; Modified: trunk/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/ftp-server.ycp?re… ============================================================================== --- trunk/ftp-server/src/ftp-server.ycp (original) +++ trunk/ftp-server/src/ftp-server.ycp Thu Mar 29 14:59:26 2012 @@ -44,14 +44,14 @@ //start-up settings CommandLine::PrintNoCR(_("Start-Up:")); if (GetStartedViaXinetd ()) { - CommandLine::Print(_("Ftp daemon is started via xinetd")); + CommandLine::Print(_("FTP daemon is started via xinetd.")); } else { if (GetEnableService()) { // TRANSLATORS: CommandLine informative text - CommandLine::Print(_("Ftp daemon is enabled in the boot process")); + CommandLine::Print(_("FTP daemon is enabled in the boot process.")); } else { // TRANSLATORS: CommandLine informative text - CommandLine::Print(_("Ftp daemon needs manual starting")); + CommandLine::Print(_("FTP daemon needs manual starting.")); } } //logging settings @@ -80,7 +80,7 @@ CommandLine::Print(FtpServer::EDIT_SETTINGS["UmaskAnon"]:nil); } else { CommandLine::PrintNoCR(_("Umask for Anonymous:")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } if (FtpServer::EDIT_SETTINGS["UmaskLocal"]:nil != "") { CommandLine::PrintNoCR(_("Umask for Authenticated Users: ")); @@ -88,7 +88,7 @@ //CommandLine::Print(""); } else { CommandLine::PrintNoCR(_("Umask for Authenticated Users: ")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); //CommandLine::Print(""); } } else { @@ -98,7 +98,7 @@ //CommandLine::Print(""); } else { CommandLine::PrintNoCR(_("Umask: ")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); //CommandLine::Print(""); } } // end of if (FtpServer::vsftpd_edit) @@ -109,7 +109,7 @@ if (FtpServer::EDIT_SETTINGS["FtpDirLocal"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["FtpDirLocal"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } @@ -119,7 +119,7 @@ if (FtpServer::EDIT_SETTINGS["FtpDirAnon"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["FtpDirAnon"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // port range CommandLine::PrintNoCR(_("Port Range: ")); @@ -128,7 +128,7 @@ CommandLine::PrintNoCR(_(" - ")); CommandLine::Print(FtpServer::EDIT_SETTINGS["PasMaxPort"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // idle time @@ -136,7 +136,7 @@ if (FtpServer::EDIT_SETTINGS["MaxIdleTime"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxIdleTime"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // maximum clients per IP @@ -144,7 +144,7 @@ if (FtpServer::EDIT_SETTINGS["MaxClientsPerIP"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxClientsPerIP"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // maximum clients @@ -152,7 +152,7 @@ if (FtpServer::EDIT_SETTINGS["MaxClientsNumber"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxClientsNumber"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // max rate for authenticated users @@ -160,7 +160,7 @@ if (FtpServer::EDIT_SETTINGS["LocalMaxRate"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["LocalMaxRate"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // max rate for anonymous users @@ -168,7 +168,7 @@ if (FtpServer::EDIT_SETTINGS["AnonMaxRate"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["AnonMaxRate"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // general settings for access @@ -180,7 +180,7 @@ } else if (FtpServer::EDIT_SETTINGS["AnonAuthen"]:nil == "0") { CommandLine::Print(_("Anonymous and Authenticated Users")); } else { - CommandLine::Print(_("Option has wrong value!")); + CommandLine::Print(_("Option has wrong value.")); } // access permissions for anonymous users @@ -202,7 +202,7 @@ if (FtpServer::EDIT_SETTINGS["Banner"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["Banner"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } //CommandLine::PrintNoCR(_("Security settings: ")); @@ -266,7 +266,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Enabling ftp daemon in the boot process...")); + CommandLine::Print(_("Enabling FTP daemon in the boot process...")); CommandLine::Print(""); SetEnableService(true); } else if (options["manual"]:nil!=nil) { @@ -275,7 +275,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Removing ftp daemon from the boot process...")); + CommandLine::Print(_("Removing FTP daemon from the boot process...")); CommandLine::Print(""); SetEnableService(false); } else if (options["xinetd"]:nil!=nil) { @@ -284,7 +284,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Start ftp daemon via xinetd")); + CommandLine::Print(_("Start FTP daemon via xinetd")); CommandLine::Print(""); SetStartedViaXinetd(true); if (options["startxinetd"]:nil == nil) { @@ -341,12 +341,12 @@ FtpServer::EDIT_SETTINGS["UmaskAnon"] = temp[0]:nil; FtpServer::EDIT_SETTINGS["UmaskLocal"] = temp[1]:nil; } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <local users>:<anonymous> (177:077)")); CommandLine::Print(""); } } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <local users>:<anonymous> (177:077)")); CommandLine::Print(""); } @@ -362,7 +362,7 @@ CommandLine::Print(""); FtpServer::EDIT_SETTINGS["Umask"] = value; } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <files>:<dirs> (set_umask=177:077)")); CommandLine::Print(""); } @@ -442,12 +442,12 @@ CommandLine::Print(""); } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Please enter minimal port < maximal port.")); + CommandLine::Error(_("Enter minimal port < maximal port.")); CommandLine::Print(""); } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Please enter correct numbers.")); + CommandLine::Error(_("Enter correct numbers.")); CommandLine::Print(""); } } else { @@ -480,7 +480,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); return false; } @@ -542,7 +542,7 @@ CommandLine::Print(""); } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); return false; } @@ -571,7 +571,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 or 2 parameters are allowed.")); + CommandLine::Error(_("Only one or two parameters are allowed.")); CommandLine::Print(""); return false; } @@ -602,7 +602,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); CommandLine::Print(_("Example of correct input: welcome_message=\"Hello everybody\"")); CommandLine::Print(""); @@ -645,13 +645,13 @@ } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong option!")); + CommandLine::Error(_("Wrong option.")); CommandLine::Print(""); return false; } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); name_option_EDIT_SETTINGS = "Example of correct using: " + name_option_EDIT_SETTINGS + " enable/disable"; CommandLine::Print(name_option_EDIT_SETTINGS); @@ -716,13 +716,13 @@ } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong option!")); + CommandLine::Error(_("Wrong option.")); CommandLine::Print(""); return false; } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); CommandLine::Print(_("Example of correct input: SSL_TLS enable/disable/only")); CommandLine::Print(""); @@ -734,7 +734,7 @@ map cmdline_description = $[ "id" : "ftp-server", /* Command line help text for the Xftpd module */ - "help" : _("Configuration of ftp server"), + "help" : _("Configuration of FTP server"), "guihandler" : FtpdSequence, "initialize" : FtpServer::Read, "finish" : FtpServer::Write, @@ -800,7 +800,7 @@ "authen_dir" : $[ "handler" : FTPdCMDAuthenDir, // TRANSLATORS: CommandLine help - "help" : _("Enter the existing directory for authenticated users (pure-ftpd only)"), + "help" : _("Enter the existing directory for authenticated users (pure-ftpd only)."), "example" : [ "authen_dir set_authen_dir=/srv/ftp", ], @@ -863,7 +863,7 @@ "access" : $[ "handler" : FTPdCMDAccess, // TRANSLATORS: CommandLine help - "help" : _("The access permissions"), + "help" : _("Access permissions"), "example" : [ "access anon_only", "access authen_only", @@ -874,7 +874,7 @@ "anon_access" : $[ "handler" : FTPdCMDAnonAccess, // TRANSLATORS: CommandLine help - "help" : _("The access permissions for anonymous users"), + "help" : _("Access permissions for anonymous users"), "example" : [ "access anon_only", "access authen_only", @@ -886,7 +886,7 @@ "welcome_message" : $[ "handler" : FTPdCMDWelMessage, // TRANSLATORS: CommandLine help - "help" : _("Welcome message is text to display when someone connects to the server (vsftpd only)"), + "help" : _("Welcome message is the text to display when someone connects to the server (vsftpd only)."), "example" : [ "welcome_message=\"hello everybody\"", ], @@ -896,7 +896,7 @@ "SSL" : $[ "handler" : FTPdCMDSSL, // TRANSLATORS: CommandLine help - "help" : _("vsftpd support secure connections via SSL (vsftpd only)"), + "help" : _("vsftpd supports secure connections via SSL (vsftpd only)."), "example" : [ "SSL enable", "SSL disable", @@ -907,7 +907,7 @@ "SSLv2" : $[ "handler" : FTPdCMDSSLv2, // TRANSLATORS: CommandLine help - "help" : _("If enabled, this option will permit SSL v2 protocol connections (vsftpd only)"), + "help" : _("If enabled, this option will permit SSL v2 protocol connections (vsftpd only)."), "example" : [ "SSLv2 enable", "SSLv2 disable", @@ -918,7 +918,7 @@ "SSLv3" : $[ "handler" : FTPdCMDSSLv3, // TRANSLATORS: CommandLine help - "help" : _("If enabled, this option will permit SSL v3 protocol connections (vsftpd only)"), + "help" : _("If enabled, this option will permit SSL v3 protocol connections (vsftpd only)."), "example" : [ "SSLv3 enable", "SSLv3 disable", @@ -929,7 +929,7 @@ "TLS" : $[ "handler" : FTPdCMDTLS, // TRANSLATORS: CommandLine help - "help" : _("vsftpd support connections via TLS (vsftpd only)"), + "help" : _("vsftpd supports connections via TLS (vsftpd only)."), "example" : [ "TLS enable", "TLS disable", @@ -941,7 +941,7 @@ "antiwarez" : $[ "handler" : FTPdCMDAntiwarez, // TRANSLATORS: CommandLine help - "help" : _("Disallow downloading of files that were uploaded but not validated by a local admin (pure-ftpd only)"), + "help" : _("Disallow downloading of files that were uploaded but not validated by a local admin (pure-ftpd only)."), "example" : [ "antiwarez enable", "antiwarez disable", @@ -972,19 +972,19 @@ "options" : $[ "atboot" : $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon in the boot process"), + "help" : _("Start FTP daemon in the boot process."), ], "manual" : $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon manually"), + "help" : _("Start FTP daemon manually."), ], "xinetd": $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon via xinetd"), + "help" : _("Start FTP daemon via xinetd"), ], "startxinetd": $[ // TRANSLATORS: CommandLine help - "help" : _("Start xinetd if it is not running"), + "help" : _("Start xinetd if it is not running."), ], "enable": $[ @@ -1018,19 +1018,19 @@ "set_min_port":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The minimum value for port range for passive connection replies."), + "help" : _("The minimum value for port range for passive connection replies"), ], "set_max_port":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The maximum value for port range for passive connection replies."), + "help" : _("The maximum value for port range for passive connection replies"), ], "set_idle_time":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("Maximum Idle Time (in minutes)."), + "help" : _("Maximum Idle Time (in minutes)"), ], @@ -1044,7 +1044,7 @@ "set_max_rate":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The maximum data transfer rate for ftp users (KB/s)."), + "help" : _("The maximum data transfer rate for ftp users (KB/s)"), ], "anon_only": $[ @@ -1064,18 +1064,18 @@ "can_upload": $[ // TRANSLATORS: CommandLine help - "help" : _("Anonymous users can upload"), + "help" : _("Anonymous users can upload."), ], "create_dirs": $[ // TRANSLATORS: CommandLine help - "help" : _("Anonymous users can create directories"), + "help" : _("Anonymous users can create directories."), ], //only vsftd "set_message": $[ "type" : "string", // TRANSLATORS: CommandLine help - "help" : _("Welcome message is text to display when someone connects to the server"), + "help" : _("Welcome message is the text to display when someone connects to the server."), ], //only vsftd @@ -1093,7 +1093,7 @@ //only vsftd "only": $[ // TRANSLATORS: CommandLine help - "help" : _("Refuse connections that do not use SSL/TLS security mechanisms"), + "help" : _("Refuse connections that do not use SSL/TLS security mechanisms."), ], Modified: trunk/ftp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/helps.ycp?rev=677… ============================================================================== --- trunk/ftp-server/src/helps.ycp (original) +++ trunk/ftp-server/src/helps.ycp Thu Mar 29 14:59:26 2012 @@ -18,7 +18,7 @@ /* Read dialog help 1/2 */ "read" : _("<big>Initializing FTP Server Configuration</big> -Please wait... + ") + /* Read dialog help 2/2 */ @@ -28,7 +28,7 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving FTP Server Configuration</big> -Please wait... + ") + @@ -47,9 +47,10 @@ /*Start widget switching daemons help 1/1 */ "selected_services": _("Selected Service - Frame shows which daemon is currently configured: vsftpd, pure-ftpd, + The frame shows which daemon is currently configured: vsftpd, pure-ftpd, . If you have installed both daemons you can switch between them. -"), + +"), /** *-----------================= GENERAL SCREEN =============---------- @@ -58,7 +59,7 @@ /* general welcome message help 1/1 */ "Banner": _("Welcome Message -This option is the name of a file containing +Specify the name of a file containing the text to display when someone connects to the server. "), @@ -69,14 +70,14 @@ When enabled, local users will be (by default) placed in a chroot() jail in their home directory after login. Warning: This option has security implications, -especially if the users have upload permission, -or shell access. Only enable if you know what you are doing. +especially if users have upload permission +or shell access. Only enable Chroot if you know what you are doing. "), /* general logging help 1/1 */ "VerboseLogging": _("Verbose Logging -When enabled, all ftp requests and responses are logged. +When enabled, all FTP requests and responses are logged. "), @@ -89,7 +90,7 @@ /* general umask for anonymous help - only vsftpd 1/1 */ "UmaskAnon": _("Umask for Anonymous: -The value that the umask for file creation is set to for anonymous users. +The value to which the umask for file creation is set for anonymous users. If you want to specify octal values, remember the \"0\" prefix, otherwise the value will be treated as a base 10 integer. @@ -97,7 +98,7 @@ /* general umask for authenticated users help - only vsftpd 1/1 */ "UmaskLocal": _("Umask for Authenticated Users: -The value that the umask for file creation is set to for authenticated users. +The value to which the umask for file creation is set for authenticated users. If you want to specify octal values, remember the \"0\" prefix, otherwise the value will be treated as a base 10 integer. @@ -105,16 +106,16 @@ /* general FTP dir for anonymous help 1/1 */ "FtpDirAnon": _("FTP Directory for Anonymous Users: -Here you can specify a directory which is used for ftp anonymous users. -By pressing Browse you can select a directory from the local filesystem. +Specify a directory which is used for FTP anonymous users. +Press Browse to select a directory from the local filesystem. "), /* general FTP dir for authenticated help 1/1 */ "FtpDirLocal": _("FTP Directory for Authenticated Users: -You can specify a directory which is used for ftp authenticated users. -By pressing Browse you can select a directory from the local filesystem. +Specify a directory which is used for FTP authenticated users. +Press Browse to select a directory from the local filesystem. "), @@ -127,22 +128,24 @@ /* performance Max Idle Time help 1/1 */ "MaxIdleTime": _("Max Idle Time: The maximum time (timeout) a remote client -may spend between ftp commands. +may wait between FTP commands. "), /* performance max clients per IP help 1/1 */ "MaxClientsPerIP": _("Max Clients for One IP: -This is the maximum number of clients which may be connected +The maximum number of clients allowed to connect from the same source internet address. -"), + +"), /* performance max clients help 1/1 */ "MaxClientsNumber": _("Max Clients: -This is the maximum number of clients which may be connected. -Any additional clients connecting will get an error message. -"), +The maximum number of clients allowed to connect. +Any additional clients trying to connect will get an error message. + +"), /* performance local max rate help 1/1 */ "LocalMaxRate": _("Local Max Rate: @@ -163,16 +166,16 @@ /* authentication Enable/Disable Anonymous and Local help 1/1 */ "AnonAuthen": _("Enable/Disable Anonymous and Local Users -Anonymous Only If enabled only anonymous logins are permitted. -Authenticated Users Only If enabled only authenticated users are permitted. -Both If enabled authenticated users and anonymous users are permitted. +Anonymous Only: If enabled, only anonymous logins are permitted. +Authenticated Users Only: If enabled, only authenticated users are permitted. +Both If enabled, authenticated users and anonymous users are permitted. "), /* authentication Enable Upload help 1/1 */ "EnableUpload": _("Enable Upload -If enabled ftp users can upload. To allow anonymous users -to upload enable Anonymous Can Upload +If enabled, FTP users can upload. To allow anonymous users +to upload, enable Anonymous Can Upload. "), @@ -187,9 +190,9 @@ /* authentication Anonymous Can Create Dirs help 1/1 */ "AnonCreatDirs": _("Anonymous Can Create Dirs -If enabled anonymous users can create directories. -vsftpd only: If you want that anonymous users can create directories you -need existing directory with allowed writing in home directory after login. +If enabled, anonymous users can create directories. +vsftpd only: If you want to allow anonymous users to create directories, +you need an existing directory with write permission in the home directory after login. "), @@ -201,7 +204,7 @@ /* expert settings Enable Passive Mode help 1/1 */ "PassiveMode": _("Enable Passive Mode -If enabled the ftp server will allow passive mode for connections. +If enabled, the FTP server will allow passive mode for connections. "), @@ -221,36 +224,41 @@ /* expert settings Enable SSL help 1/1 */ "SSLEnable": _("Enable SSL -If enabled SSL connections are allowed. -"), +If enabled, SSL connections are allowed. + +"), /* expert settings Enable SSL v2 help 1/1 */ "SSLv2": _("Enable SSL v2 -If enabled SSL version 2 connections are allowed. -"), +If enabled, SSL version 2 connections are allowed. + +"), /* expert settings Enable SSL v3 help 1/1 */ "SSLv3": _("Enable SSL v3 -If enabled SSL version 3 connections are allowed. -"), +If enabled, SSL version 3 connections are allowed. + +"), /* expert settings Enable TLS help 1/1 */ "TLS": _("Enable TLS -If enabled TLS connections are allowed. -"), +If enabled, TLS connections are allowed. + +"), /* expert settings DSA Certificate to Use for SSL Encrypted Connections help 1/1 */ -"CertFile": _("DSA Certificate to Use for SSL Encrypted Connections +"CertFile": _("DSA Certificate to Use for SSL-encrypted Connections This option specifies the location of the DSA certificate to -use for SSL encrypted connections. You can select a file by pressing Browse +use for SSL-encrypted connections. Select a file by pressing Browse. "), /* expert settings Disable Downloading Unvalidated Data help 1/1 */ "AntiWarez": _("Disable Downloading Unvalidated Data Disallow downloading of files that were uploaded -but not validated by a local admin -"), +but not validated by a local admin. + +"), /* expert settings Security Settings help 1/1 */ @@ -268,13 +276,13 @@ /* Summary dialog help 1/3 */ "summary" : _("<big>FTP Server Configuration</big> -Configure the ftp server here. +Configure the FTP server. ")+ /* Summary dialog help 2/3 */ _("<big>Adding an FTP Server:</big> -Choose an ftp server from the list of detected ftp servers. -If your ftp server was not detected, use Other (not detected). +Choose an FTP server from the list of detected FTP servers. +If your FTP server was not detected, use Other (not detected). Then press Configure. ") + @@ -286,19 +294,20 @@ /* Ovreview dialog help 1/3 */ "overview" : _("<big>FTP Server Configuration Overview</big> -Obtain an overview of the installed ftp servers. Additionally, +Obtain an overview of the installed FTP servers. Additionally, edit their configurations. ") + /* Ovreview dialog help 2/3 */ _("<big>Adding a FTP Server</big> -Press Add to configure a ftp server. +Press Add to configure a FTP server. ") + /* Ovreview dialog help 3/3 */ _("<big>Editing or Deleting</big> -Choose a ftp server to change or remove. -Then press Edit or Delete, respectively.\n"), +Choose a FTP server to change or remove. +Then press Edit or Delete respectively. +"), ]; Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp… ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Thu Mar 29 14:59:26 2012 @@ -172,7 +172,7 @@ if (FtpServer::WriteStartViaXinetd(true,true) && result) { FtpServer::vsftp_xinetd_running = true; FtpServer::pure_ftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -207,7 +207,7 @@ FtpServer::stop_daemon_xinetd = true; if (FtpServer::WriteStartViaXinetd(true,true)) { FtpServer::vsftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is not running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is not running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, true); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, false); result = true; @@ -247,7 +247,7 @@ FtpServer::stop_daemon_xinetd = false; if (FtpServer::WriteStartViaXinetd(true,false) && result) { FtpServer::vsftp_xinetd_running = true; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -292,7 +292,7 @@ if (FtpServer::WriteStartViaXinetd(true,true) && result) { FtpServer::pure_ftp_xinetd_running = true; FtpServer::vsftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -328,7 +328,7 @@ FtpServer::stop_daemon_xinetd = true; if (FtpServer::WriteStartViaXinetd(true,true)) { FtpServer::pure_ftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is not running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is not running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, true); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, false); result = true; @@ -366,7 +366,7 @@ FtpServer::stop_daemon_xinetd = false; if (FtpServer::WriteStartViaXinetd(true,false) && result) { FtpServer::pure_ftp_xinetd_running = true; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -445,14 +445,14 @@ void InitStartStopRestart (string key) { if ((FtpServer::pure_ftp_xinetd_running) && (!FtpServer::vsftpd_edit)) { - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); } if ((FtpServer::vsftp_xinetd_running) && (FtpServer::vsftpd_edit)) { - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); } @@ -677,7 +677,7 @@ symbol HandleBrowseAnon (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseAnon") { - string val = UI::AskForExistingDirectory ("/",_("Please select directory...")); + string val = UI::AskForExistingDirectory ("/",_("Select directory")); UI::ChangeWidget(`id( "FtpDirAnon" ), `Value, val); } return nil; @@ -708,7 +708,7 @@ symbol HandleBrowseLocal (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseLocal") { - string val = UI::AskForExistingDirectory ("/",_("Please select directory...")); + string val = UI::AskForExistingDirectory ("/",_("Select directory")); UI::ChangeWidget(`id( "FtpDirLocal" ), `Value, val); } return nil; @@ -915,7 +915,7 @@ yesno_question = _("Do you want to change permissions for ") + FtpServer::anon_homedir +_("Upload (allow writing)?"); - yesno_comment = _("If you want anonymous users to be able to upload, you need a directory with write access. + yesno_comment = _("To allow anonymous users to upload, you need a directory with write access. "); yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); @@ -928,7 +928,7 @@ if (((button == "AnonCreatDirs") || (anon_create_dirs) && (check_upload)) && (ask_again)) { if (!FtpServer::create_upload_dir) { yesno_question = _("Do you want to create a directory?\n") + FtpServer::anon_homedir +_("Upload with write access?"); - yesno_comment = _("If you want anonymous users to be able to create directories, + yesno_comment = _("If you want to allow anonymous users to create directories, you have to create a directory with write access. "); @@ -1364,7 +1364,7 @@ symbol HandleBrowseCertFile (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseCertFile") { - string val = UI::AskForExistingFile ("/","*.*",_("Please Select File")); + string val = UI::AskForExistingFile ("/","*.*",_("Select File")); UI::ChangeWidget(`id( "CertFile" ), `Value, val); } } Modified: trunk/ftp-server/yast2-ftp-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/yast2-ftp-server.spec… ============================================================================== --- trunk/ftp-server/yast2-ftp-server.spec.in (original) +++ trunk/ftp-server/yast2-ftp-server.spec.in Thu Mar 29 14:59:26 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Requires: yast2-inetd -- 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] r67769 - /tags/stable-2_22_1/firstboot/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:47:47 2012 New Revision: 67769 URL: http://svn.opensuse.org/viewcvs/yast?rev=67769&view=rev Log: Created tag stable-2_22_1 for firstboot Added: tags/stable-2_22_1/firstboot/ - copied from r67768, trunk/firstboot/ -- 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] r67768 - in /trunk/firstboot: VERSION package/yast2-firstboot.changes src/firstboot_auto.ycp src/firstboot_language_keyboard.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:47:25 2012 New Revision: 67768 URL: http://svn.opensuse.org/viewcvs/yast?rev=67768&view=rev Log: - merged proofed texts Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/firstboot_auto.ycp trunk/firstboot/src/firstboot_language_keyboard.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=67768&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Thu Mar 29 14:47:25 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Thu Mar 29 14:47:25 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 14:47:01 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- 2.22.1 + +------------------------------------------------------------------- Fri Jan 13 11:13:19 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/firstboot/src/firstboot_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_auto.ycp… ============================================================================== --- trunk/firstboot/src/firstboot_auto.ycp (original) +++ trunk/firstboot/src/firstboot_auto.ycp Thu Mar 29 14:47:25 2012 @@ -65,7 +65,8 @@ // text label, describing the check box meaning // keep in 2 lines with roughly the same length _("Check Enable Firstboot Sequence here to start YaST -firstboot utility on the first boot after configuration")), +firstboot utility on the first boot after configuration. +")), `VSpacing (), // check box label `CheckBox (`id (`enable), _("Enable Firstboot Sequence"), @@ -74,7 +75,8 @@ Wizard::CreateDialog(); // help text Wizard::SetContentsButtons (caption, contents, _("Check Enable Firstboot Sequence to start YaST firstboot utility on the first boot after configuration. -Check the documentation of yast2-firstboot module to find out more."), +Check the documentation of yast2-firstboot module for further information. +"), Label::BackButton(), Label::NextButton()); ret = UI::UserInput (); Modified: trunk/firstboot/src/firstboot_language_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language… ============================================================================== --- trunk/firstboot/src/firstboot_language_keyboard.ycp (original) +++ trunk/firstboot/src/firstboot_language_keyboard.ycp Thu Mar 29 14:47:25 2012 @@ -106,8 +106,8 @@ // help text for firstboot language + keyboard screen string help_text = _(" -Choose the Language and the Keyboard layout to be used during -configuration and for the installed system. +Choose the Language and the Keyboard Layout to be used during +configuration and in the installed system. ") + // help text, continued -- 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] r67767 - /trunk/yast2/library/network/src/yast2-services-translations.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:46:36 2012 New Revision: 67767 URL: http://svn.opensuse.org/viewcvs/yast?rev=67767&view=rev Log: - merged proofed texts Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/yast2-… ============================================================================== --- trunk/yast2/library/network/src/yast2-services-translations.ycp (original) +++ trunk/yast2/library/network/src/yast2-services-translations.ycp Thu Mar 29 14:46:36 2012 @@ -20,25 +20,25 @@ tmpstring = _("cyrus-imapd Server"); // TRANSLATORS: Description of a Service (File name: cyrus-imapd, RPM: cyrus-imapd), used as a common label or an item in table - tmpstring = _("Opens ports for the cyrus-imapd Server."); + tmpstring = _("Open ports for the cyrus-imapd Server."); // TRANSLATORS: Name of Service (File name: dhcp-server, RPM: dhcp), can be used as check box, item in multiple selection box... tmpstring = _("DHCPv4 Server"); // TRANSLATORS: Description of a Service (File name: dhcp-server, RPM: dhcp), used as a common label or an item in table - tmpstring = _("Opens ports for ISC DHCPv4 4.x Server."); + tmpstring = _("Open ports for ISC DHCPv4 4.x server."); // TRANSLATORS: Name of Service (File name: dnsmasq-dhcp, RPM: dnsmasq), can be used as check box, item in multiple selection box... tmpstring = _("dnsmasq"); // TRANSLATORS: Description of a Service (File name: dnsmasq-dhcp, RPM: dnsmasq), used as a common label or an item in table - tmpstring = _("Open ports for the dnsmasq DNS/DHCP server"); + tmpstring = _("Open ports for the dnsmasq DNS/DHCP server."); // TRANSLATORS: Name of Service (File name: dnsmasq-dns, RPM: dnsmasq), can be used as check box, item in multiple selection box... tmpstring = _("dnsmasq"); // TRANSLATORS: Description of a Service (File name: dnsmasq-dns, RPM: dnsmasq), used as a common label or an item in table - tmpstring = _("Open ports for the dnsmasq DNS/DHCP server"); + tmpstring = _("Open ports for the dnsmasq DNS/DHCP server."); // TRANSLATORS: Name of Service (File name: hplip, RPM: hplip), can be used as check box, item in multiple selection box... tmpstring = _("mDNS/Bonjour support for HPLIP"); @@ -62,43 +62,43 @@ tmpstring = _("iSNS Daemon"); // TRANSLATORS: Description of a Service (File name: isns, RPM: isns), used as a common label or an item in table - tmpstring = _("Opens ports for iSNS daemon with broadcast allowed."); + tmpstring = _("Open ports for iSNS daemon with broadcast allowed."); // TRANSLATORS: Name of Service (File name: netbios-server, RPM: samba), can be used as check box, item in multiple selection box... tmpstring = _("Netbios Server"); // TRANSLATORS: Description of a Service (File name: netbios-server, RPM: samba), used as a common label or an item in table - tmpstring = _("Opens ports for Samba Netbios Server with broadcast allowed."); + tmpstring = _("Open ports for Samba Netbios server with broadcast allowed."); // TRANSLATORS: Name of Service (File name: nfs-client, RPM: nfs-client), can be used as check box, item in multiple selection box... tmpstring = _("NFS Client"); // TRANSLATORS: Description of a Service (File name: nfs-client, RPM: nfs-client), used as a common label or an item in table - tmpstring = _("Firewall Configuration for NFS client. Opens ports for NFS client to allow connection to an NFS server."); + tmpstring = _("Firewall configuration for NFS client. Open ports for NFS client to allow connection to an NFS server."); // TRANSLATORS: Name of Service (File name: nfs-kernel-server, RPM: nfs-kernel-server), can be used as check box, item in multiple selection box... tmpstring = _("NFS Server Service"); // TRANSLATORS: Description of a Service (File name: nfs-kernel-server, RPM: nfs-kernel-server), used as a common label or an item in table - tmpstring = _("Firewall Configuration for NFS kernel server. Opens ports for NFS to allow other hosts to connect."); + tmpstring = _("Firewall configuration for NFS kernel server. Open ports for NFS to allow other hosts to connect."); // TRANSLATORS: Name of Service (File name: ntp, RPM: ntp), can be used as check box, item in multiple selection box... tmpstring = _("xntp Server"); // TRANSLATORS: Description of a Service (File name: ntp, RPM: ntp), used as a common label or an item in table - tmpstring = _("Opens ports for xntp."); + tmpstring = _("Open ports for xntp."); // TRANSLATORS: Name of Service (File name: openldap, RPM: openldap2), can be used as check box, item in multiple selection box... tmpstring = _("OpenLDAP Server"); // TRANSLATORS: Description of a Service (File name: openldap, RPM: openldap2), used as a common label or an item in table - tmpstring = _("Opens ports for the OpenLDAP Server (slapd)."); + tmpstring = _("Open ports for the OpenLDAP server (slapd)."); // TRANSLATORS: Name of Service (File name: openslp, RPM: openslp-server), can be used as check box, item in multiple selection box... - tmpstring = _("Openslp server (SLP)"); + tmpstring = _("OpenSLP Server (SLP)"); // TRANSLATORS: Description of a Service (File name: openslp, RPM: openslp-server), used as a common label or an item in table - tmpstring = _("Enables Openslp server to advertise services"); + tmpstring = _("Enable OpenSLP server to advertise services."); // TRANSLATORS: Name of Service (File name: rsync-server, RPM: rsync), can be used as check box, item in multiple selection box... tmpstring = _("Rsync server"); @@ -110,25 +110,25 @@ tmpstring = _("Samba Client"); // TRANSLATORS: Description of a Service (File name: samba-client, RPM: samba-client), used as a common label or an item in table - tmpstring = _("Enables browsing of SMB shares"); + tmpstring = _("Enable browsing of SMB shares."); // TRANSLATORS: Name of Service (File name: samba-server, RPM: samba), can be used as check box, item in multiple selection box... tmpstring = _("Samba Server"); // TRANSLATORS: Description of a Service (File name: samba-server, RPM: samba), used as a common label or an item in table - tmpstring = _("Opens ports for Samba Server."); + tmpstring = _("Open ports for Samba server."); // TRANSLATORS: Name of Service (File name: sendmail, RPM: sendmail), can be used as check box, item in multiple selection box... tmpstring = _("SMTP with sendmail"); // TRANSLATORS: Description of a Service (File name: sendmail, RPM: sendmail), used as a common label or an item in table - tmpstring = _("Firewall Configuration file for sendmail"); + tmpstring = _("Firewall configuration file for sendmail"); // TRANSLATORS: Name of Service (File name: sshd, RPM: openssh), can be used as check box, item in multiple selection box... tmpstring = _("Secure Shell Server"); // TRANSLATORS: Description of a Service (File name: sshd, RPM: openssh), used as a common label or an item in table - tmpstring = _("Open ports for Secure Shell Server"); + tmpstring = _("Open ports for the Secure Shell server."); // TRANSLATORS: Name of Service (File name: svnserve, RPM: subversion), can be used as check box, item in multiple selection box... tmpstring = _("svnserve"); @@ -146,18 +146,18 @@ tmpstring = _("VNC"); // TRANSLATORS: Description of a Service (File name: vnc-server, RPM: tightvnc), used as a common label or an item in table - tmpstring = _("Opens VNC server ports so that viewers can connect."); + tmpstring = _("Open VNC server ports so that viewers can connect."); // TRANSLATORS: Name of Service (File name: vsftpd, RPM: vsftpd), can be used as check box, item in multiple selection box... tmpstring = _("vsftpd Server"); // TRANSLATORS: Description of a Service (File name: vsftpd, RPM: vsftpd), used as a common label or an item in table - tmpstring = _("Opens ports for vsftpd Server."); + tmpstring = _("Open ports for vsftpd server."); // TRANSLATORS: Name of Service (File name: ypbind, RPM: ypbind), can be used as check box, item in multiple selection box... tmpstring = _("NIS Client"); // TRANSLATORS: Description of a Service (File name: ypbind, RPM: ypbind), used as a common label or an item in table - tmpstring = _("The ypbind daemon binds NIS clients to an NIS domain"); + tmpstring = _("The ypbind daemon binds NIS clients to an NIS domain."); } -- 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] r67766 - in /trunk/firewall: package/yast2-firewall.changes src/helps.ycp src/summary.ycp src/uifunctions.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:45:55 2012 New Revision: 67766 URL: http://svn.opensuse.org/viewcvs/yast?rev=67766&view=rev Log: - merged proofread texts Modified: trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/helps.ycp trunk/firewall/src/summary.ycp trunk/firewall/src/uifunctions.ycp Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.… ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Thu Mar 29 14:45:55 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 14:45:40 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Fri Nov 4 15:50:22 CET 2011 - locilka(a)suse.cz - Added function keys for buttons (bnc#595564) Modified: trunk/firewall/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/helps.ycp?rev=67766… ============================================================================== --- trunk/firewall/src/helps.ycp (original) +++ trunk/firewall/src/helps.ycp Thu Mar 29 14:45:55 2012 @@ -52,15 +52,16 @@ // TRANSLATORS: Allowed services dialog help 1/2 "allowed-services" : _("<big>Allowed Services</big> - Here, specify services or ports that should be accessible from the network. + Specify services or ports that should be accessible from the network. Networks are divided into firewall zones. To allow a service, select the Zone and the Service to Allow then press Add. To remove an allowed service, select the Zone and the Allowed Service then press Delete. -By deselecting Protect Firewall from Internal Zone, remove -protection from the zone. All services and ports would be unprotected from this zone. +By deselecting Protect Firewall from Internal Zone, you remove +protection from the zone. All services and ports in your internal network will +be unprotected. ") + // TRANSLATORS: Allowed services dialog help 2/2 @@ -191,18 +192,21 @@ // TRANSLATORS: help for Installation Proposal Dialog "installation_proposal" : _("<big>Firewall</big> -Firewall is a defensive mechanism that protects your computer from network attacks."), +A firewall is a defensive mechanism that protects your computer from network attacks. +"), // TRANSLATORS: general help for Custom Rules 1/5 "custom-rules" : _("<big>Custom Rules</big> -Here you can set special firewall rules that allow new connections -matching these rules.") + +Set special firewall rules that allow new connections +matching these rules. +") + // TRANSLATORS: general help for Custom Rules 2/5 _("Source Network -Network or IP where the connection comes from, +Network or IP address where the connection comes from, e.g., <tt>192.168.0.1</tt> or <tt>192.168.0.0/255.255.255.0</tt> -or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).") + +or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>). +") + // TRANSLATORS: general help for Custom Rules 3/5 _("Protocol @@ -223,9 +227,10 @@ // TRANSLATORS: help for Custom Rules - Adding new rule 1/4 "custom-rules-popup" : _("Source Network -Network or IP where the connection comes from, +Network or IP address where the connection comes from, e.g., <tt>192.168.0.1</tt> or <tt>192.168.0.0/255.255.255.0</tt> -or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).") + +or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>). +") + // TRANSLATORS: help for Custom Rules - Adding new rule 2/4 _("Protocol Modified: trunk/firewall/src/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/summary.ycp?rev=677… ============================================================================== --- trunk/firewall/src/summary.ycp (original) +++ trunk/firewall/src/summary.ycp Thu Mar 29 14:45:55 2012 @@ -331,21 +331,21 @@ // Is running and will be running again if (SuSEFirewall::IsStarted()) { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration has been written") + li_end + "\n"; // Is stopped and will be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration has been written") + li_end + "\n"; } } else { // Is running and will be stopped if (SuSEFirewall::IsStarted()) { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will be stopped after the configuration is written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will be stopped after the configuration has been written") + li_end + "\n"; // Is not running and will not be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will not start after the configuration is written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will not start after the configuration has been written") + li_end + "\n"; } } Modified: trunk/firewall/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/uifunctions.ycp?rev… ============================================================================== --- trunk/firewall/src/uifunctions.ycp (original) +++ trunk/firewall/src/uifunctions.ycp Thu Mar 29 14:45:55 2012 @@ -1206,7 +1206,8 @@ if (Popup::YesNo (_("Firewall automatic starting has been disabled but firewall is currently running. -Stop the firewall after the new configuration is written?"))) { +Stop the firewall after the new configuration has been written? +"))) { y2milestone ("User decided to stop the firewall after it is disabled"); new_running = false; } else { -- 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] r67765 - /tags/stable-2_22_2/fingerprint-reader/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:41:55 2012 New Revision: 67765 URL: http://svn.opensuse.org/viewcvs/yast?rev=67765&view=rev Log: Created tag stable-2_22_2 for fingerprint-reader Added: tags/stable-2_22_2/fingerprint-reader/ - copied from r67764, trunk/fingerprint-reader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0