Author: jsmeix Date: Wed Feb 11 12:38:06 2009 New Revision: 55408 URL: http://svn.opensuse.org/viewcvs/yast?rev=55408&view=rev Log: - Fixed various typos in various texts (see Novell/Suse Bugzilla bnc#440839 bnc#442537 bnc#465401 bnc#465720 bnc#466371). - 2.18.4 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/Printerlib.ycp trunk/printer/src/basicadd.ycp trunk/printer/src/helps.ycp trunk/printer/src/overview.ycp trunk/printer/src/printer.ycp trunk/printer/src/printer_proposal.ycp trunk/printer/src/printingvianetwork.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Feb 11 12:38:06 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Feb 11 12:38:06 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 11 12:27:55 CET 2009 - jsmeix@suse.de + +- Fixed various typos in various texts (see Novell/Suse Bugzilla + bnc#440839 bnc#442537 bnc#465401 bnc#465720 bnc#466371). +- 2.18.4 + +------------------------------------------------------------------- Tue Feb 10 15:01:34 CET 2009 - mzugec@suse.cz - enable cups autoconfig on 64-bit (bnc#464683) Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed Feb 11 12:38:06 2009 @@ -1227,7 +1227,7 @@ "", // Busy message: // Body of a Popup::ShowFeedback: - _("Determine available drivers...") + _("Determining matching printer drivers...") ); y2milestone( "The driver_filter_string is: '%1'", driver_filter_string ); integer ppds_index = -1; @@ -1284,7 +1284,7 @@ "", // Busy message: // Body of a Popup::ShowFeedback: - _("Processing many drivers. Please wait...") + _("Processing many printer drivers. Please wait...") ); // Sleep half a second to let the user notice the feedback in any case: sleep( 500 ); Modified: trunk/printer/src/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/src/Printerlib.ycp (original) +++ trunk/printer/src/Printerlib.ycp Wed Feb 11 12:38:06 2009 @@ -285,7 +285,7 @@ // E.g. because parsing of thousands of PPDs may need much time. // Therefore enforce waiting one minute now. // (Plain busy message without title.) - Popup::ShowFeedback( "", _("The CUPS daemon in not yet accessible.\nWaiting one minute so that it is ready to operate...") ); + Popup::ShowFeedback( "", _("The CUPS daemon is not yet accessible.\nWaiting one minute so that it is ready to operate...") ); sleep( 60000 ); Popup::ClearFeedback(); } Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Wed Feb 11 12:38:06 2009 @@ -238,7 +238,7 @@ { Popup::AnyMessage( // Header of a Popup::AnyMessage when a wrong queue name was entered: _("Invalid Queue Name"), // Body of a Popup::AnyMessage when a wrong queue name was entered: - _("Only letters [A-Za-z], numbers [0-9], and '_' are allowed for the queue name.") + _("Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are allowed for the queue name.") ); continue; } Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Wed Feb 11 12:38:06 2009 @@ -155,7 +155,7 @@ _("<p> Application programs do not show the actual printer device but its associated <b>queue name</b>.<br> -Only letters [A-Za-z], numbers [0-9], and the underscore '_' +Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are allowed for the queue name and it must start with a letter. </p>"), @@ -204,8 +204,9 @@ Application programs often show description and location in the print dialog. To make sure that those strings look correct in any language which a particular user of a particular application program may use, -it is safe when you use only plain text without special characters -(e.g. only letters [A-Za-z], numbers [0-9], and spaces). +it is safe when you use only plain ASCII text without +special characters e.g. only ASCII letters (a-z and A-Z), +ASCII numbers (0-9), and the ASCII space character (20 hex). Usually the description describes the model and optionally the driver (e.g. 'ACME FunPrinter 1000 using generic PCL driver') and the location describes where the printer is located @@ -312,7 +313,7 @@ usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br> A network printer with IP 192.168.100.1 which is accessible via port 9100 may have a device URI like:<br> -socket://192.168.101.202:9100<br> +socket://192.168.100.1:9100<br> A network printer with IP 192.168.100.2 which is accessible via LPD protocol with a remote LPD queue name 'lpt1' may have a device URI like:<br> @@ -404,7 +405,6 @@ To access print queues on a Novell Netware print server, the RPM package ncpfs must be installed. The package provides the CUPS backend 'novell' which runs -CUPS 1.1.18 the <tt>nprint</tt> program which actually sends the data to a Novell Netware print queue. A server name and a printer queue name is needed to access it. @@ -520,7 +520,7 @@ and depending on the actual kind of failure, the CUPS backend which actually sends the data to the printer can overwrite the default error policy -and enforce another error policy (see 'man backend'). +and enforce another error policy (see <tt>man backend</tt>). For example it can stop any further printing attempt even when the default error policy is to retry the job. This could happen when any attempt to establish @@ -538,27 +538,12 @@ _("<p> <b><big>CUPS Autoconfiguration for USB Printers</big></b><br> When a USB printer is connected to the system -cups-autoconfig determines if the printer is already configured. +cups-autoconfig determines if the printer is already configured. If it is already configured, printing is enabled. If the printer is not configured, cups-autoconfig attempts to select an appropriate driver for it and, if successful, cups-autoconfig configures it. When a USB printer is removed, cups-autoconfig can disable printing. -</p>"), - -"useless_help" : -// Useless help 1/1: -_("<p> -<b><big>Intentionally no help</big></b><br> -This is an experimental YaST module.<br> -The dialog should be self-explanatory.<br> -Usability experts state that a UI is very likely -bad designed when explanation texts are needed.<br> -For a real test whether the dialog is self-explanatory or not, -there must be no help text at all.<br> -Unfortunately it is not possible to remove the -help sub-window from 'Wizard' dialogs -(this dialog is a so called 'Wizard' dialog). </p>") ]; Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Wed Feb 11 12:38:06 2009 @@ -146,10 +146,10 @@ Check with 'netstat -nap | grep cupsd' where the cupsd actually listens. This happens when there is a 'Listen ...:1234' or 'Port 1234' setting in /etc/cups/cupsd.conf (check also if there is 'BrowsePort 1234'). -The YaST printer modue does not support a non-official port. +The YaST printer module does not support a non-official port. A non-official port leads to an endless sequence of further failures. If you really must use a non-official port, you cannot use -the YaST printer modue to configure your printers. +the YaST printer module to configure your printers. "); Wizard::SetDesktopIcon("printer"); // The button with "back/cancel" functionality is removed here @@ -203,7 +203,7 @@ // when the YaST printer module started and if the cupsd does not listen // on the official IPP port, a single error popup when the Overview dialog // is launched is sufficient. - // The YaST printer modue does not support when the cupsd listens + // The YaST printer module does not support when the cupsd listens // on a non-official port e.g. via "Listen *:1234" and/or "Port 1234" // and/or "BrowsePort 1234" settings in /etc/cups/cupsd.conf. // Skip this test (and hope for the best) when netcat is not available Modified: trunk/printer/src/printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer.ycp?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/src/printer.ycp (original) +++ trunk/printer/src/printer.ycp Wed Feb 11 12:38:06 2009 @@ -49,8 +49,8 @@ include "printer/wizards.ycp"; map cmdline_description = $[ - "id" : "printer", - /* Command line help text for the Xprinter module */ + "id" : "printer", + /* Command line help text for the printer module */ "help" : _("Configuration of printer"), "guihandler" : PrinterSequence, "initialize" : Printer::Read, Modified: trunk/printer/src/printer_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/src/printer_proposal.ycp (original) +++ trunk/printer/src/printer_proposal.ycp Wed Feb 11 12:38:06 2009 @@ -151,7 +151,7 @@ // E.g. because parsing of thousands of PPDs may need much time. // Therefore enforce waiting one minute now. // (Plain busy message without title.) - Popup::ShowFeedback( "", _("The CUPS daemon in not yet accessible.\nWaiting one minute so that it is ready to operate...") ); + Popup::ShowFeedback( "", _("The CUPS daemon is not yet accessible.\nWaiting one minute so that it is ready to operate...") ); sleep( 60000 ); Popup::ClearFeedback(); } @@ -161,7 +161,7 @@ // A special case is when the cupsd does not listen on the official IANA IPP port (631). // Then Printerlib::GetAndSetCupsdStatus("") returns false because it calls // "lpstat -h localhost -r" which fails ("-h localhost:port" would have to be used). - // The YaST printer modue does not support when the cupsd listens on a non-official port + // The YaST printer module does not support when the cupsd listens on a non-official port // so that also in this special case no automated queue setup is done. if( ! Printerlib::GetAndSetCupsdStatus( "" ) ) { y2milestone("Skipped automated queue setup because there is no local cupsd accessible (via port 631)."); Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.ycp?rev=55408&r1=55407&r2=55408&view=diff ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Wed Feb 11 12:38:06 2009 @@ -165,7 +165,7 @@ // A header for a TextEntry where the user can enter // the one single remote CUPS server which is used // to do all his printing tasks: - _("&Hostname / IP Address") + _("&CUPS server name / IP Address") ), `VBox ( `Label(""), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org