Author: jsuchome Date: Thu Mar 29 15:58:49 2012 New Revision: 67808 URL: http://svn.opensuse.org/viewcvs/yast?rev=67808&view=rev Log: - merge proofread texts Modified: trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/src/helps.ycp Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=67808&r1=67807&r2=67808&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Thu Mar 29 15:58:49 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:58:34 CEST 2012 - jsuchome@suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Fri Dec 16 08:49:24 UTC 2011 - coolo@suse.com - it's actually GPL 2.0 only Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=67808&r1=67807&r2=67808&view=diff ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Thu Mar 29 15:58:49 2012 @@ -480,13 +480,11 @@ // Do not simply use "driver" because net is no normal driver but a metadriver. // Do not change or translate "scanimage -L", it is a fixed command. _("Failed to determine the active scanners. -When the net metadriver is activated and something is wrong -in the network, it can happen that there is no response from -the 'scanimage -L' command. For example when the communication -with a server which should be used by the net metadriver +If the net metadriver is activated while there is a problem +with the network, the 'scanimage -L' command may not respond. For example, +this may happen if communication with a server used by the net metadriver gets distorted because a firewall drops some network traffic. -In this case it should help to disable the net metadriver -as a workaround until the issue in the network is fixed. +In this case, disable the net metadriver until the issue in the network is fixed. "); if( ! ExecuteBashCommand( determine_active_scanners_commandline ) ) { if( 10 == result["exit"]:9999 ) @@ -1030,18 +1028,18 @@ string displaytest_failed_message = // Message of a Popup::Error when hp-setup should be run. // Do not change or translate "hp-setup", it is a program name: -_("Cannot run hp-setup because no graphical display can be opened. -This happens in particular when YaST runs in text-only mode, -or when the user who runs YaST has no DISPLAY environment variable set, -or when the YaST process is not allowed to access the graphical display. -In this case you should abort the scanner configuration now, -run hp-setup manually, and start the scanner configuration again afterwards. +_("Cannot run hp-setup because no graphical display can be opened. +This happens if YaST runs in text-only mode, or the user who runs YaST +has no DISPLAY environment variable set, or if the YaST process is not +allowed to access the graphical display. In this case, abort the scanner +configuration, run hp-setup manually, and start the scanner configuration +again afterwards. "); string install_hplip_message = // Message of a Popup::YesNo when hplip should be installed. // Do not change or translate "hp-setup", it is a program name. // Do not change or translate "hplip", it is a package name: -_("It seems hplip is not installed which is required to run hp-setup. +_("It seems hplip is not installed, which is required to run hp-setup. Should the hplip package be installed? "); string hpsetup_not_executable_message = @@ -1793,7 +1791,7 @@ _("There is at least one printer configuration that uses the ptal service. It is possible to proceed but then the ptal service would be stopped and all print queues that use the ptal service would no longer work. -When you proceed, change the printer configuration to use HPLIP. +If you proceed, change the printer configuration to use HPLIP. "); string hpoj_message = // Message of a Popup::YesNo for scanners which should be set up with the hpoj driver Modified: trunk/scanner/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/helps.ycp?rev=67808&r1=67807&r2=67808&view=diff ============================================================================== --- trunk/scanner/src/helps.ycp (original) +++ trunk/scanner/src/helps.ycp Thu Mar 29 15:58:49 2012 @@ -72,19 +72,18 @@ // Do not change or translate "lsusb", it is a command name. _("<p> A normal USB scanner should be detected automatically. -By default only those USB scanners are shown +By default, only those USB scanners are shown for which the UDB vendor and product IDs are known. If a USB scanner is not shown or if there are unexpected results, try <b>Other</b> and <b>Restart Detection</b>. -Then it might happen that particular USB devices which are not scanners -are shown too because then all USB devices which might be scanners are shown. -The reason is that there is no generic way to reliably distinguish a scanner +It might happen that particular USB devices which are not scanners +are shown too. There is no generic way to reliably distinguish a scanner from other USB devices because there is no USB device class for scanners. -It may also work to proceed with <b>Add</b>. +Try to proceed with <b>Add</b>. For HP all-in-one devices you may have to run <tt>hp-setup</tt> via <b>Other</b> and <b>Run hp-setup</b> before you can configure the scanner unit with this tool. -If you have difficulties configuring your scanner here, +If you have difficulties configuring your scanner, check whether it appears in the output of <tt>lsusb</tt>. If it is not listed there, the USB system cannot communicate with the scanner. </p> @@ -103,12 +102,13 @@ _("<p> Parallel port scanners cannot be configured with this tool except for HP all-in-one devices. -Usual parallel port scanners must be configured manually. -To set up the scanner unit in a HP all-in-one device +Common parallel port scanners must be configured manually. +To set up the scanner unit in a HP all-in-one device, which is connected to the parallel port, you may have to run <tt>hp-setup</tt> via <b>Other</b> and <b>Run hp-setup</b> before you can configure the scanner unit with this tool using <b>Add</b>. -</p>") + +</p> +") + // Overview dialog help 6/8: // Do not confuse a "network scanner" (i.e. a scanner which is directly accessible in the network) // with a "network scanner" (i.e. a program which scans the network for other hosts or services) @@ -124,11 +124,12 @@ so it is directly accessible in the network. In contrast, scanning via network means accessing a remote scanner connected to another host in the network. -To set up the scanner unit in a HP all-in-one device +To set up the scanner unit in a HP all-in-one device, which is connected via a built-in network interface, you may have to run <tt>hp-setup</tt> via <b>Other</b> and <b>Run hp-setup</b> before it works to configure the scanner unit with this tool using <b>Add</b>. -</p>") + +</p> +") + // Overview dialog help 7/8: // Do not confuse "scanning via network" (i.e. use a remote scanner via another host in the network) // with "scanning the network" (i.e. scan the network for other hosts or services). -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org