Author: jsuchome Date: Thu Mar 29 15:42:48 2012 New Revision: 67797 URL: http://svn.opensuse.org/viewcvs/yast?rev=67797&view=rev Log: - merged proofread texts Modified: trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/Printerlib.ycp trunk/printer/src/autoconfig.ycp trunk/printer/src/connectionwizard.ycp trunk/printer/src/driveradd.ycp trunk/printer/src/helps.ycp trunk/printer/src/overview.ycp trunk/printer/src/policies.ycp trunk/printer/src/printer_proposal.ycp trunk/printer/src/printingvianetwork.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Mar 29 15:42:48 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:42:29 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Thu Jan 12 15:45:29 UTC 2012 - coolo@suse.com - add an explicit GPL-2.0 license to the spec file template Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Thu Mar 29 15:42:48 2012 @@ -473,7 +473,7 @@ // is 640x480 pixels (y2qt) or 80x25 characters (y2ncurses). UI::ReplaceWidget( `id(`create_database_progress_replace_point), `ProgressBar( // Header for a finished ProgressBar: - _("Retrieved printer driver information"), + _("Retrieved Printer Driver Information"), 100, 100 ) @@ -2295,7 +2295,7 @@ if( fail_if_executable_is_missing ) { // Show negative feedback: Popup::ErrorDetails( // Popup::ErrorDetails message: - _("Cannot execute the program 'netcat'"), + _("Cannot execute the program 'netcat'."), // Popup::ErrorDetails details: _("The RPM package 'netcat' is required for a meaningful test.") + "\n" + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" @@ -2326,7 +2326,7 @@ if( fail_if_executable_is_missing ) { // Show negative feedback: Popup::ErrorDetails( // Popup::ErrorDetails message - _("Cannot execute the program 'ping'"), + _("Cannot execute the program 'ping'."), // Popup::ErrorDetails details: _("The RPM package 'iputils' is required for a meaningful test.") + "\n" + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" @@ -2346,7 +2346,7 @@ // Show negative feedback: Popup::ErrorDetails( sformat( // Popup::ErrorDetails message // where %1 will be replaced by the server name. - _("The server '%1' is not accessible"), + _("The server '%1' is not accessible."), server_name ), // Popup::ErrorDetails details: @@ -2380,7 +2380,7 @@ if( fail_if_executable_is_missing ) { // Show negative feedback: Popup::ErrorDetails( // Popup::ErrorDetails message - _("Cannot execute the program 'host'"), + _("Cannot execute the program 'host'."), // Popup::ErrorDetails details: _("The RPM package 'bind-utils' is required for a meaningful test.") + "\n" + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" @@ -2400,7 +2400,7 @@ // Show negative feedback: Popup::ErrorDetails( sformat( // Popup::ErrorDetails message // where %1 will be replaced by the server name. - _("The server '%1' does not respond in the network"), + _("The server '%1' does not respond in the network."), server_name ), // Popup::ErrorDetails details: @@ -2430,7 +2430,7 @@ // Show negative feedback: Popup::ErrorDetails( sformat( // Popup::ErrorDetails message // where %1 will be replaced by the server name. - _("The server '%1' is unknown"), + _("The server '%1' is unknown."), server_name ), // Popup::ErrorDetails details: Modified: trunk/printer/src/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/Printerlib.ycp (original) +++ trunk/printer/src/Printerlib.ycp Thu Mar 29 15:42:48 2012 @@ -255,9 +255,9 @@ // Enforce user confirmation before a new service is started // to be on the safe side that the user knows about it: if( ! Popup::YesNoHeadline( // PopupYesNoHeadline headline: - _("Start local running CUPS daemon"), + _("Start locally running CUPS daemon"), // PopupYesNoHeadline body: - _("A local running CUPS daemon is needed.") + _("A locally running CUPS daemon is needed.") ) ) { return false; @@ -276,7 +276,9 @@ // the BrowseInterval in cupsd.conf on remote CUPS servers is by default 30 seconds // so that the local cupsd should listen at least 31 seconds to get Browsing info // before e.g. the Overview dialog can be shown with the right current queues. - Popup::TimedMessage( _("Started the CUPS daemon.\nWaiting half a minute so that it is ready to operate..."), + Popup::TimedMessage( _("Started the CUPS daemon. +Waiting half a minute for the CUPS daemon to get ready to operate... +"), 30 ); local_cupsd_accessible = ExecuteBashCommand( local_cupsd_accessible_commandline ); @@ -294,7 +296,7 @@ local_cupsd_accessible = ExecuteBashCommand( local_cupsd_accessible_commandline ); if( ! local_cupsd_accessible ) { Popup::Error( // Popup::Error message: - _("No local running CUPS daemon is accessible.") + _("No locally running CUPS daemon is accessible.") ); return false; } @@ -313,9 +315,9 @@ // to be on the safe side regarding complaints in an enterprise environment // because a restart disrupts all currently actively printing jobs: if( ! Popup::YesNoHeadline( // PopupYesNoHeadline headline: - _("Restart local running CUPS daemon"), + _("Restart locally running CUPS daemon"), // PopupYesNoHeadline body: - _("A restart disrupts all currently actively printing jobs.") + _("A restart disrupts all currently active print jobs.") ) ) { return false; @@ -336,13 +338,15 @@ // the BrowseInterval in cupsd.conf on remote CUPS servers is by default 30 seconds // so that the local cupsd should listen at least 31 seconds to get Browsing info // before e.g. the Overview dialog can be shown with the right current queues. - Popup::TimedMessage( _("Restarted the CUPS daemon.\nWaiting half a minute so that it is ready to operate..."), + Popup::TimedMessage( _("Restarted the CUPS daemon. +Waiting half a minute for the CUPS daemon to get ready to operate... +"), 30 ); local_cupsd_accessible = ExecuteBashCommand( local_cupsd_accessible_commandline ); if( ! local_cupsd_accessible ) { Popup::Error( // Popup::Error message: - _("No local running CUPS daemon is accessible.") + _("No locally running CUPS daemon is accessible.") ); return false; } @@ -372,9 +376,9 @@ // to be on the safe side regarding complaints in an enterprise environment // because a stop disrupts all currently actively printing jobs: if( ! Popup::YesNoHeadline( // PopupYesNoHeadline headline: - _("Stop local running CUPS daemon"), + _("Stop locally running CUPS daemon"), // PopupYesNoHeadline body: - _("A stop disrupts all currently actively printing jobs.") + _("A stop disrupts all currently active print jobs.") ) ) { return false; @@ -390,7 +394,7 @@ local_cupsd_accessible = ExecuteBashCommand( local_cupsd_accessible_commandline ); if( local_cupsd_accessible ) { Popup::Error( // Popup::Error message: - _("A local running CUPS daemon is still accessible.") + _("A locally running CUPS daemon is still accessible.") ); return false; } @@ -436,7 +440,7 @@ // cups_client_only fails when the client-only server is not accessible: Popup::ErrorDetails( // Popup::ErrorDetails message // where %1 will be replaced by the server name. - sformat( _("The CUPS server '%1' is not accessible"), client_conf_server_name ), + sformat( _("The CUPS server '%1' is not accessible."), client_conf_server_name ), result["stderr"]:"" ); client_only = true; Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Thu Mar 29 15:42:48 2012 @@ -90,7 +90,7 @@ if( Printerlib::client_only ) { if( ! Popup::YesNoHeadline( sformat( // PopupYesNoHeadline headline // where %1 will be replaced by the server name: - _("Disable remote CUPS server '%1'"), + _("Disable Remote CUPS Server '%1'"), Printerlib::client_conf_server_name ), // PopupYesNoHeadline body: Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Thu Mar 29 15:42:48 2012 @@ -405,7 +405,7 @@ // Header for a ComboBox to optionally select the printer manufacturer. // Do not change or translate "raw", it is a technical term // when no driver is used for a print queue. - _("You may select a printer &manufacturer if no 'raw queue' should be set up"), + _("Select a printer &manufacturer if no 'raw queue' should be set up."), prepend( Printer::known_manufacturers, "Raw Queue" ) ) ); @@ -515,10 +515,10 @@ ), `MenuButton ( // TRANSLATORS: Label for menu to search for remote servers - _("Look Up"), + _("Look up"), [ `item( `id(`scan), scan_hosts_label ), // TRANSLATORS: Button to search for remote servers - `item( `id(`scan_all), _("Look Up for All Hosts") ) + `item( `id(`scan_all), _("Look up for All Hosts") ) ] ) ) @@ -1351,10 +1351,10 @@ //), //`MenuButton //( // TRANSLATORS: Label for menu to search for remote servers - // _("Look Up"), + // _("Look up"), // [ `item( `id(`scan), _("Scan for samba printers") ), // // TRANSLATORS: Button to search for remote servers - // `item( `id(`scan_all), _("Look Up for All Hosts") ) + // `item( `id(`scan_all), _("Look up for All Hosts") ) // ] ) ) @@ -1564,10 +1564,10 @@ ), `MenuButton ( // TRANSLATORS: Label for menu to search for remote servers - _("Look Up"), + _("Look up"), [ `item( `id(`scan), _("Scan for IPP Servers") ), `item( `id(`scan_broadcast), _("Scan for IPP Broadcasts") ), - `item( `id(`scan_all), _("Look Up for All Hosts") ) + `item( `id(`scan_all), _("Look up for All Hosts") ) ] ) ) @@ -1676,7 +1676,7 @@ `Left ( `Frame ( // TRANSLATORS: Frame label for authentication - _("Authenticate As"), + _("Authenticate as"), `VBox ( `InputField ( `id(`user), @@ -1974,7 +1974,7 @@ `item ( `id(`server), // TRANSLATORS: Tree widget item - _("Print Via Print Server Machine"), + _("Print via Print Server Machine"), true, [ // TRANSLATORS: Tree widget item `item( `id(`smb), _("Windows (R) or Samba (SMB/CIFS)") ), @@ -2443,7 +2443,7 @@ valid = true; } else - { Popup::Error( _("Device URI, number of retries, and delay could not be empty." ) ); + { Popup::Error( _("Device URI, number of retries, and delay could not be empty.") ); } break; case(`pipe): Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Thu Mar 29 15:42:48 2012 @@ -538,7 +538,7 @@ } if( ! Printerlib::ExecuteBashCommand( "cupstestppd -W constraints -W defaults -W translations -r '" + ppd_path_input_value + "'" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message: - _("The printer description file is not in compliance to the specification."), + _("The printer description file is not in compliance with the specification."), // The cupstestppd report is on stdout: Printerlib::result["stdout"]:"" + "\nREF is the Adobe PostScript Printer Description File Format Specification" Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Thu Mar 29 15:42:48 2012 @@ -41,39 +41,41 @@ // Read dialog help 1/1: _("<p> <b><big>Initializing printer Configuration</big></b><br> -Please wait...<br> -</p>"), +</p> +"), "write" : // Write dialog help 1/1: _("<p> <b><big>Finishing printer Configuration</big></b><br> -Please wait...<br> -</p>"), +</p> +"), "overview" : // Overview dialog help 1/7: _("<p> <b><big>Print Queue Overview</big></b><br> A printer device is not used directly but via a print queue.<br> -When various application programs submit print jobs simultaneously, +When various applications submit print jobs simultaneously, these jobs are put in a queue and are sent one after the other to the printer device.<br> It is possible to have several different print queues for the same printer device. For example a second queue with a monochrome-only driver for a color device or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer. -</p>") + +</p> +") + // Overview dialog help 2/7: _("<p> <b><big>Using Remote Queues:</big></b><br> -Remote queues exist on other hosts in the network -and therefore they cannot be changed on this host.<br> -The remote queues which are listed here are known on this host -and usually they can be used directly by application programs -so that there is no need to set up a local queue for a printer -which is already available via a remote queue.<br> -</p>") + +Remote queues exist on other hosts in the network, +therefore they cannot be changed on this host.<br> +The remote queues listed here are known on this host. +Usually they can be used directly by applications +so there is no need to set up a local queue for a printer +that is already available via a remote queue.<br> +</p> +") + // Overview dialog help 3/7: _("<p> <b><big>Configure a printer:</big></b><br> @@ -97,14 +99,14 @@ // Overview dialog help 7/7: _("<p> <b><big>Refresh the list of queues:</big></b><br> -In particular after changes regarding printing via network +After changes to the network printing settings, the available remote queues may have changed. Usually it takes some time (up to several minutes) -until such changes become known to the local host -so that it is useful to press <b>Refresh List</b> -after some time to get an up-to-date list -of available remote queues. -</p>"), +until such changes become known to the local host. +Press <b>Refresh List</b> after some time to get an +up-to-date list of available remote queues. +</p> +"), "AutoYaSToverview" : // AutoYaST Overview dialog help 1/1: @@ -146,10 +148,11 @@ In particular HP devices are often accessible both via the 'usb:/...' and the 'hp:/...' connection. The latter is provided by the HP driver package 'hplip'. -For plain printing both kind of connections should work but for anything else -(e.g. device status via 'hp-toolbox', or scanning with a HP all-in-one device) +For plain printing, both kinds of connections should work, but for anything else +(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device) the 'hp:/...' connection must be used. -</p>") + +</p> +") + // BasicAddDialog help 4/7: _("<p> The <b>driver</b> determines that the right data is produced for the @@ -243,7 +246,7 @@ </p>") + // BasicModifyDialog help 2/4: _("<p> -The <b>connection</b> determines which way data is sent to the printer device.<br> +The <b>connection</b> determines how data is sent to the printer device.<br> If a wrong connection is selected, no data can be sent to the device so that there cannot be any printout.<br> If a printer device is accessible via more than one connection type, @@ -251,37 +254,36 @@ In particular HP devices are often accessible both via the 'usb:/...' and the 'hp:/...' connection. The latter is provided by the HP driver package 'hplip'. -For plain printing both kind of connections should work but for anything else -(e.g. device status via 'hp-toolbox', or scanning with a HP all-in-one device) +For plain printing, both kinds of connections should work, but for anything else +(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device) the 'hp:/...' connection must be used.<br> -When you exchange the currently used connection by another one, +When you exchange the currently used connection with another one, the input field for the driver search string is preset -with the autodetected model name of the new selected connection -and those drivers where the driver description matches to the model name +with the autodetected model name of the new selected connection. +The drivers for which the driver description matches the model name are shown by default.<br> -If driver descriptions match to the autodetected model name +If driver descriptions match the autodetected model name and if all matching driver descriptions seem to belong to the same model, the driver descriptions are sorted so that the most reasonable driver should be listed topmost (but still below the currently used driver). On the other hand, it does not necessarily mean that this driver is a reasonable driver for your particular needs. -Strictly speaking the topmost listed driver -may not work at all for your particular printer model. -The reason is that the automated driver selection -can only work based upon comparison of strings -(the autodetected model name and the driver descriptions) -so that the result can be only a best-guess proposal +The topmost listed driver may not work at all for your particular +printer model. The automated driver selection +compares strings (the autodetected model name and the driver +descriptions) so the result can only be a best-guess proposal how to set up your particular printer model.<br> -Therefore check if the currently preselected values make sense -and feel free to play around and modify the settings -to what you know what works best for your printer.<br> -If no driver description matches to the autodetected model name, -it does not necessarily mean that there is no driver available for the model. -Often only the model name in the driver descriptions +Therefore check if the currently preselected values make sense. +Feel free to play around and modify the settings +to what you know works best for your printer.<br> +If no driver description matches the autodetected model name, it does +not necessarily mean that there is no driver available for the model. +Often the model name in the driver descriptions is different from the autodetected model name. Therefore you can enter whatever you like as driver search string and search through all available driver descriptions. -</p>") + +</p> +") + // BasicModifyDialog help 3/4: _("<p> The <b>driver</b> determines that the right data is produced for the @@ -335,79 +337,87 @@ _("<p> <b><big>Set Driver Options</big></b><br> Usually it is best to leave the driver defaults because -the defaults should be reasonable for usual printing.<br> -Additionally the print dialogs in usual application programs +the defaults should be reasonable for most cases.<br> +Additionally, the print dialogs in most applications show the driver options too so that each user can specify driver options for each individual printout.<br> -The only setting which should be checked in any case is the paper size +The only setting which should be checked in any case is the paper size, which must be set to what is actually used by default in the printer. -</p>") + +</p> +") + // DriverOptionsDialog help 2/3: _("<p> -Non-default settings may not work in any case or have unexpected consequences.<br> -For example a high resolution setting may not work for a laser printer -when its default built-in memory is insufficient to process high resolution pages.<br> -Or a high quality setting may print intolerable slow on an inkjet printer. -</p>") + +Non-default settings may not work in all cases or have unexpected +consequences.<br> +For example, a high resolution setting may not work for a laser printer +when its default built-in memory is insufficient to process high resolution +pages.<br> +Or a high quality setting may print intolerably slow on an inkjet printer. +</p> +") + // DriverOptionsDialog help 3/3: _("<p> -On the other hand in certain cases printer-specific driver settings +In certain cases printer-specific driver settings must be adjusted to get the full functionality of a printer.<br> -In particular when the printer has optional units installed like -duplex unit or optional paper feeders, the matching driver settings +In particular, when the printer has optional units installed like +a duplex unit or optional paper feeders, the respective driver settings should be checked and adjusted.<br> -For example a duplex unit option must be set to 'installed' or 'true' +For example, a duplex unit option must be set to 'installed' or 'true' otherwise the driver may ignore duplex printing option settings. -</p>"), +</p> +"), "add_driver_dialog" : // AddDriverDialog help 1/2: _("<p> <b><big>Add or Remove Printer Driver Packages</big></b><br> -When a printer driver package is not marked, it is not installed -and then you can select it so that it will be installed.<br> -When a printer driver package is marked, it is installed -and then you can un-select it so that it will be removed. -In the latter case it is up to you to make sure -that there is no printer configuration which needs the driver.<br> -</p>") + +If a printer driver package is not marked, it is not installed. +Select the package if you want to install it.<br> +If a printer driver package is marked, it is installed. +Deselect the package if you want to remove it. +In the latter case, make sure that there is no printer configuration +which needs the driver.<br> +</p> +") + // AddDriverDialog help 2/2: _("<p> <b><big>Add a Printer Description File</big></b><br> -To set up a printer configuration a printer description file +To set up a printer configuration, a printer description file (PPD file) is required.<br> -When a PPD file is not located in the /usr/share/cups/model/ directory, +If a PPD file is not located in the /usr/share/cups/model/ directory, it is not available to set up a printer configuration with it. -Therefore you can specify the full path of a PPD file -which is located elsewhere on your system to get it installed +Therefore you can specify the full path of a PPD file, +which is located elsewhere on your system, to get it installed in the /usr/share/cups/model/ directory.<br> Note that a printer description file is not a driver.<br> For non-PostScript printers the PPD file alone is not sufficient to set up a working printer configuration. -In particular it does not work for non-PostScript printers +In particular, it does not work for non-PostScript printers to download a PPD file from the Internet and then set up the printer with such a PPD file. The plain printer setup would work but actual printing -would not work because the driver is missing. -For non-PostScript printers you need a printer driver -and a PPD file which matches exactly to the particular driver. +would not work because the driver would be missing. +For non-PostScript printers, you need a printer driver +and a PPD file which matches exactly the particular driver. Matching PPD files are automatically installed at the right place when you install the above mentioned printer driver packages.<br> Only for PostScript printers, a PPD file alone is usually sufficient to set up a working PostScript printer configuration. -In particular it is sufficient when the PPD file does not +In particular, it is sufficient when the PPD file does not contain a 'cupsFilter' entry because such an entry would reference a printer driver.<br> -</p>"), +</p> +"), "connection_wizard_dialog" : // ConnectionWizardDialog help 1/7: _("<p> <b><big>Specify the Connection</big></b><br> -The <b>connection</b> determines which way data is sent to the printer device.<br> +The <b>connection</b> determines how data is sent to the printer device.<br> If a wrong connection is used, no data can be sent to the device so that there cannot be any printout. -</p>") + +</p> +") + // ConnectionWizardDialog help 2/7: _("<p> <b><big>Printer Device URI</big></b><br> @@ -543,38 +553,39 @@ <b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b><br> A printserver box is a small device with a network connection and a USB or parallel port connection to connect the actual printer. -A network printer has such kind of device built-in. +A network printer has such a device built-in. Access happens via three different network protocols. See the manual of your network printer or printserver box -what your particular device supports:<br> +to find out what your particular device supports:<br> <b>TCP Port (AppSocket/JetDirect)</b><br> The IP address and a port number is needed to access it. Often the port number 9100 is the right one. It is the simplest, fastest, and generally the most reliable protocol. The matching device URI is:<br> -socket://ip-address:port-number<br> +socket://ip-address:port-number<br>. <b>Line Printer Daemon (LPD) Protocol</b><br> A LPD runs on the device and provides one or more LPD queues. The IP address and a LPD queue name is needed to access it. Almost all network printers and printserver boxes support it. -Often an arbitrary queue name or 'LPT1' works somehow. -But using a correct LPD queue which does not somehow change +Often an arbitrary queue name or 'LPT1' works. +But using a correct LPD queue which does not change the data or add additional formfeeds or banner pages could be essential for reliable printing. The matching device URI is:<br> -lpd://ip-address/queue<br> +lpd://ip-address/queue<br>. <b>Internet Printing Protocol (IPP)</b><br> -IPP is the native protocol for CUPS which runs on a real computer -but when IPP is implemented in a small printserver box, -it is often not implemented properly. Only use IPP when the vendor -actually documents official support for it. +IPP is the native protocol for CUPS running on a real computer, +but if IPP is implemented in a small printserver box, +it is often not implemented properly. Only use IPP if the vendor +actually documents official support for it. The matching device URI is:<br> -ipp://ip-address:port-number/resource<br> -What 'port-number' and 'resource' exactly is depends totally +ipp://ip-address:port-number/resource<br>. +What 'port-number' and 'resource' exactly is depends on the particular network printer or printserver box model.<br> For <b>more information</b> have a look at<br> http://www.cups.org/documentation.php/network.html -</p>") + +</p> +") + // ConnectionWizardDialog help 6/7: _("<p> <b><big>Device URIs to Print Via a Print Server Machine</big></b><br> Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Thu Mar 29 15:42:48 2012 @@ -131,7 +131,7 @@ // to check whether or not a local cupsd is accessible. // The command is shown here to the user (even if it is a bit technical) // to have him informed what goes on here and what he can do on his own. -_("A local running CUPS daemon is required but it seems to be not accessible. +_("A locally running CUPS daemon is required, but it seems to be not accessible. Check with 'lpstat -h localhost -r' whether a local cupsd is accessible. A non-accessible cupsd leads to an endless sequence of further failures. "); @@ -878,7 +878,7 @@ { Popup::Notify( // When the user had selected that "Testpage printing failed" for a local queue // but the test_print_cups_error_log was effectively empty, // show a very generic info to the user to show at least something: - _( "For CUPS log information, see the /var/log/cups/error_log file." ) + _("For CUPS log information, see the /var/log/cups/error_log file.") ); } } @@ -888,7 +888,7 @@ if( ! test_print_success ) { Popup::Notify( // When the user had selected that "Testpage printing failed" for a non-local queue // show a very generic info to the user to show at least something: - _( "When printing via a remote system fails, you may ask an admin of the remote system." ) + _("When printing via a remote system fails, you may ask an admin of the remote system.") ); } } @@ -908,7 +908,7 @@ if( Printerlib::client_only ) { if( ! Popup::YesNoHeadline( // PopupYesNoHeadline headline // where %1 will be replaced by the server name: - sformat( _("Disable remote CUPS server '%1'"), Printerlib::client_conf_server_name ), + sformat( _("Disable Remote CUPS Server '%1'"), Printerlib::client_conf_server_name ), // PopupYesNoHeadline body: _("A remote CUPS server setting conflicts with adding a configuration.") ) Modified: trunk/printer/src/policies.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/policies.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/policies.ycp (original) +++ trunk/printer/src/policies.ycp Thu Mar 29 15:42:48 2012 @@ -46,7 +46,7 @@ // which is used when it fails to send a job to the printer is to // re-send the job from the beginning after waiting some time // (the default JobRetryInterval is 30 seconds but this can be changed): -string error_policy_retry_job_string = _("re-send the job from the beginning after waiting some time"); +string error_policy_retry_job_string = _("re-send the job after waiting some time"); // An entry for a ComboBox from which the user can select that the CUPS error policy // which is used when it fails to send a job to the printer is to // abort and delete the job and proceed with the next job: @@ -120,7 +120,7 @@ if( Printerlib::client_only ) { if( ! Popup::YesNoHeadline( sformat( // PopupYesNoHeadline headline // where %1 will be replaced by the server name: - _("Disable remote CUPS server '%1'"), + _("Disable Remote CUPS Server '%1'"), Printerlib::client_conf_server_name ), // PopupYesNoHeadline body: Modified: trunk/printer/src/printer_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/printer_proposal.ycp (original) +++ trunk/printer/src/printer_proposal.ycp Thu Mar 29 15:42:48 2012 @@ -149,7 +149,9 @@ if( ! Printerlib::GetAndSetCupsdStatus( "" ) ) { // After waiting 10 seconds without user notification, become verbose now. // Wait half a minute for a new started cupsd: - Popup::TimedMessage( _("Started the CUPS daemon.\nWaiting half a minute so that it is ready to operate..."), + Popup::TimedMessage( _("Started the CUPS daemon. +Waiting half a minute for the CUPS daemon to get ready to operate... +"), 30 ); } Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Thu Mar 29 15:42:48 2012 @@ -338,7 +338,7 @@ // Therefore a Popup::MessageDetails is shown to inform about the actual result: Popup::MessageDetails( // Popup::MessageDetails message // where %1 will be replaced by the server name. - sformat( _("Tried to set 'ServerName %1' in /etc/cups/client.conf"), + sformat( _("Tried to set 'ServerName %1' in /etc/cups/client.conf."), current_client_conf_value ), Printerlib::result["stderr"]:"" @@ -348,7 +348,7 @@ } Popup::ErrorDetails( // Popup::ErrorDetails message // where %1 will be replaced by the server name. - sformat( _("Failed to set 'ServerName %1' in /etc/cups/client.conf"), + sformat( _("Failed to set 'ServerName %1' in /etc/cups/client.conf."), current_client_conf_value ), Printerlib::result["stderr"]:"" @@ -370,7 +370,7 @@ // so that the client-only config should be disabled: if( ! Popup::YesNoHeadline( // PopupYesNoHeadline headline // where %1 will be replaced by the server name: - sformat( _("Disable remote CUPS server '%1'"), Printerlib::client_conf_server_name ), + sformat( _("Disable Remote CUPS Server '%1'"), Printerlib::client_conf_server_name ), // PopupYesNoHeadline body: _("The checkbox to do all printing via one CUPS server was disabled.") ) @@ -437,7 +437,7 @@ // An effectively non-empty current_browse_allow_value requires "Browsing On" in cupsd.conf: if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Browsing On" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message: - _("Failed to set 'Browsing On' in /etc/cups/cupsd.conf"), + _("Failed to set 'Browsing On' in /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; @@ -451,7 +451,7 @@ ) { Popup::ErrorDetails( // Popup::ErrorDetails message // where %1 will be replaced by the values for BrowseAllow. - sformat( _("Failed to set BrowseAllow value(s) '%1' in /etc/cups/cupsd.conf"), + sformat( _("Failed to set BrowseAllow value(s) '%1' in /etc/cups/cupsd.conf."), current_browse_allow_value ), Printerlib::result["stderr"]:"" @@ -473,7 +473,7 @@ // Instead set only "BrowseAllow none" in cupsd.conf: if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf BrowseAllow none" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message: - _("Failed to set 'BrowseAllow none' in /etc/cups/cupsd.conf"), + _("Failed to set 'BrowseAllow none' in /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; @@ -511,7 +511,7 @@ { // An effectively non-empty current_browse_poll_value requires "Browsing On" in cupsd.conf: if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Browsing On" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message: - _("Failed to set 'Browsing On' in /etc/cups/cupsd.conf"), + _("Failed to set 'Browsing On' in /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=67797&r1=67796&r2=67797&view=diff ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Thu Mar 29 15:42:48 2012 @@ -60,7 +60,7 @@ ( `id(`deny_remote_access_radio_button), `opt(`notify), // A RadioButton label to deny remote access to local print queues: - _("&Deny remote access"), + _("&Deny Remote Access"), initial_deny_remote_access ) ), @@ -69,7 +69,7 @@ ( `id(`allow_remote_access_radio_button), `opt(`notify), // A RadioButton label to allow remote access to local print queues: - _("&Allow remote access"), + _("&Allow Remote Access"), initial_allow_remote_access ) ), @@ -185,7 +185,7 @@ ( `id(`browse_address_input), // TextEntry to publish local print queues // to IP addresses and/or network broadcast addresses: - _("Publish to those IP addresses or network &broadcast addresses (separated by space)") + _("Publish to these IP addresses or network &broadcast addresses (separated by space)") ) ) ) @@ -329,7 +329,7 @@ if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Listen localhost" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message. // Do not change or translate "Listen localhost", it is a system settings name. - _("Failed to set only 'Listen localhost' in /etc/cups/cupsd.conf"), + _("Failed to set only 'Listen localhost' in /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; @@ -337,7 +337,7 @@ if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Allow none" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message. // Do not change or translate "Allow", it is a system settings name. - _("Failed to remove 'Allow' entries from /etc/cups/cupsd.conf"), + _("Failed to remove 'Allow' entries from /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; @@ -350,7 +350,7 @@ if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf BrowseAddress none" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message. // Do not change or translate "BrowseAddress", it is a system settings name. - _("Failed to remove 'BrowseAddress' entries from /etc/cups/cupsd.conf"), + _("Failed to remove 'BrowseAddress' entries from /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; @@ -447,7 +447,7 @@ { Popup::ErrorDetails( sformat( // Popup::ErrorDetails message // where %1 will be replaced by one or more system settings values. // Do not change or translate "Allow", it is a system settings name. - _("Failed to set 'Allow' entries '%1' in /etc/cups/cupsd.conf"), + _("Failed to set 'Allow' entries '%1' in /etc/cups/cupsd.conf."), allow_values ), Printerlib::result["stderr"]:"" @@ -464,7 +464,7 @@ { Popup::ErrorDetails( sformat( // Popup::ErrorDetails message // where %1 will be replaced by one or more system settings values. // Do not change or translate "BrowseAddress", it is a system settings name. - _("Failed to set 'BrowseAddress' entries '%1' in /etc/cups/cupsd.conf"), + _("Failed to set 'BrowseAddress' entries '%1' in /etc/cups/cupsd.conf."), browse_address_values ), Printerlib::result["stderr"]:"" @@ -475,7 +475,7 @@ // otherwise browsing information would not be sent at all: if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Browsing On" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message: - _("Failed to set 'Browsing On' in /etc/cups/cupsd.conf"), + _("Failed to set 'Browsing On' in /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; @@ -491,7 +491,7 @@ if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf BrowseAddress none" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message. // Do not change or translate "BrowseAddress", it is a system settings name. - _("Failed to remove 'BrowseAddress' entries from /etc/cups/cupsd.conf"), + _("Failed to remove 'BrowseAddress' entries from /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; @@ -506,7 +506,7 @@ if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Listen all" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message. // Do not change or translate "Listen *:631", it is a system settings name. - _("Failed to set 'Listen *:631' in /etc/cups/cupsd.conf"), + _("Failed to set 'Listen *:631' in /etc/cups/cupsd.conf."), Printerlib::result["stderr"]:"" ); return false; @@ -533,7 +533,7 @@ if( Printerlib::client_only ) { if( ! Popup::YesNoHeadline( sformat( // PopupYesNoHeadline headline // where %1 will be replaced by the server name: - _("Disable remote CUPS server '%1'"), + _("Disable Remote CUPS Server '%1'"), Printerlib::client_conf_server_name ), // PopupYesNoHeadline body: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org