Author: jsuchome Date: Thu Mar 29 16:09:30 2012 New Revision: 67818 URL: http://svn.opensuse.org/viewcvs/yast?rev=67818&view=rev Log: - merge proofread texts Modified: trunk/support/package/yast2-support.changes trunk/support/src/Support.ycp trunk/support/src/dialogs.ycp trunk/support/src/helps.ycp trunk/support/src/supportconfig_conf.ycp Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.changes?rev=67818&r1=67817&r2=67818&view=diff ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Thu Mar 29 16:09:30 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:09:16 CEST 2012 - jsuchome@suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Fri Aug 5 12:35:28 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/support/src/Support.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/Support.ycp?rev=67818&r1=67817&r2=67818&view=diff ============================================================================== --- trunk/support/src/Support.ycp (original) +++ trunk/support/src/Support.ycp Thu Mar 29 16:09:30 2012 @@ -242,7 +242,7 @@ global boolean Read() { /* Support read dialog caption */ - string caption = _("Initializing support Configuration"); + string caption = _("Initializing Support Configuration"); configuration = (map)SCR::Read(.etc.supportconfig.all); foreach(map<string, any> row, configuration["value"]:[], { @@ -272,7 +272,7 @@ global boolean Write() { /* Support read dialog caption */ - string caption = _("Saving support Configuration"); + string caption = _("Saving Support Configuration"); // TODO FIXME And set the right number of stages integer steps = 2; Modified: trunk/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/dialogs.ycp?rev=67818&r1=67817&r2=67818&view=diff ============================================================================== --- trunk/support/src/dialogs.ycp (original) +++ trunk/support/src/dialogs.ycp Thu Mar 29 16:09:30 2012 @@ -49,7 +49,7 @@ `Frame(_("Open Novell Support Center"), `VBox( `HStretch (), - `Left (`Label(_("This will start a browser with Novell Support Center Portal."))), + `Left (`Label(_("This will start a browser connecting to the Novell Support Center Portal."))), `HBox ( `HStretch(), `HStretch(), @@ -67,7 +67,7 @@ `Frame(`opt (`hstretch), _("Collect Data"), `VBox( `HStretch (), - `Left (`Label(_("This will create tarball with collected log files."))), + `Left (`Label(_("This will create a tarball containing the collected log files."))), `HBox ( `HStretch(), `HStretch(), @@ -86,7 +86,7 @@ `Frame(`opt (`hstretch), _("Upload Data"), `VBox( `HStretch (), - `Label(_("This will upload collected logs into specified URL.")), + `Label(_("This will upload the collected logs to the specified URL.")), `HBox ( `HStretch(), `HStretch(), @@ -115,15 +115,16 @@ break; else if (ret == `browser){ - if (Support::browser==nil) Popup::Error(_("Couldn't find any installed browser.")); + if (Support::browser==nil) Popup::Error(_("Could not find any installed browser.")); else{ string url="'http://www.novell.com/center/eservice'"; if (0 == SCR::Execute (.target.bash, "env|grep LOGNAME|cut -d'=' -f2- | grep root")) { - if (Popup::ContinueCancel (sformat (_("YaST will run a web browser as superuser. Consider -running it as a non-provileged user and entering URL + if (Popup::ContinueCancel (sformat (_("YaST will run a Web browser as superuser. Consider +running it as a non-provileged user and entering the URL %1. -Start web browser?"), url))) +Start Web browser? +"), url))) { y2milestone("Executing browser %1 with URL %2", Support::browser, url); SCR::Execute(.target.bash, sformat("%1 %2", Support::browser, url)); @@ -170,7 +171,7 @@ term contents = `Frame("", `VBox( load_save, - `CheckBoxFrame(`id(`upload), _("Upload log files tarball into URL"), true, + `CheckBoxFrame(`id(`upload), _("Upload log files tarball to URL"), true, `Left( `InputField(`id(`url), _("Upload Target"), url) ) ) ) @@ -500,7 +501,7 @@ )), `Frame (_("Upload Information"), `VBox( `Left(`InputField(`id(`target), _("Upload Target"), deletechars(Support::options["VAR_OPTION_UPLOAD_TARGET"]:"", "'"))), - `Left(`InputField(`id(`novell_number), _("Novell 11 digit service request number"), Support::novell_number)) + `Left(`InputField(`id(`novell_number), _("Novell 11-digit service request number"), Support::novell_number)) ))); Wizard::SetContentsButtons(caption, contents, HELPS["contact"]:"", Modified: trunk/support/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/helps.ycp?rev=67818&r1=67817&r2=67818&view=diff ============================================================================== --- trunk/support/src/helps.ycp (original) +++ trunk/support/src/helps.ycp Thu Mar 29 16:09:30 2012 @@ -37,8 +37,8 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<p><b><big>Initializing support Configuration</big></b><br> -Please wait...<br></p> + "read" : _("<p><b><big>Initializing Support Configuration</big></b><br> +</p> ") + /* Read dialog help 2/2 */ @@ -47,8 +47,8 @@ "), /* Write dialog help 1/2 */ - "write" : _("<p><b><big>Saving support Configuration</big></b><br> -Please wait...<br></p> + "write" : _("<p><b><big>Saving Support Configuration</big></b><br> +</p> ") + /* Write dialog help 2/2 */ @@ -65,7 +65,7 @@ /* Summary dialog help 2/3 */ _("<p><b><big>Adding a support:</big></b><br> -Choose an support from the list of detected supports. +Choose a support from the list of detected supports. If your support was not detected, use <b>Other (not detected)</b>. Then press <b>Configure</b>.</p> ") + @@ -79,9 +79,10 @@ /* Ovreview dialog help 1/3 */ "overview" : _(" <p><b><big>Opening Novell Support Center</big></b><br> -To start a web browser that opens the Novell Support Center Portal, use <b>Open Novell Support Center</b>. +To start a Web browser that opens the Novell Support Center Portal, use <b>Open Novell Support Center</b>. You can then open a Service Request with Novell Technical Support. Make sure you write down -the Service Request number to include in the supportconfig data upload.</p>") +the Service Request number to include in the supportconfig data upload.</p> +") /* Ovreview dialog help 2/3 */ + _("<p><b><big>Collecting Data</big></b><br> To run the supportconfig data collection tool, use <b>Collect Data</b></p>") @@ -96,13 +97,15 @@ gather the most data or only gather a minimum amount of data.") /* Configure1 dialog help 2/3 */ + _("<p><b><big>Expert Settings</big></b><br> -Select <b>Use Custom</b> and the <b>Expert Settings</b> button -to select specific data sets to collect.</p>") +Select <b>Use Custom</b> and click the <b>Expert Settings</b> button +to select specific data sets to collect.</p> +") /* Configure1 dialog help 3/3 */ + _("<p><b><big>Options</big></b><br> -You can collect additional information. Usually these options are not -necessary, but can be included when circumstances require.</p>"), +Collect additional information. Usually these options are not +necessary, but can be included if circumstances require more information.</p> +"), /* Expert dialog help 1/1 */ "expert_params" : _("<p><big><b>Default Options</b></big><br> @@ -125,49 +128,61 @@ scp://central.server.foo.com/supportconfig/archives</p>") /* Contact dialog help 4/4 */ + _("<p><b>Note:</b> If you are uploading a supportconfig tarball to Novell Technical Support, -make sure you include the Novell 11 digit service request number from your open service request."), +make sure you include the Novell 11-digit service request number from your open service request. +"), /* Collecting data dialkog help 1/1 */ "collecting" : _("<p><b><big>Collecting Data</big></b>><br> -Please wait while the data is being collected.</p>"), +Data is being collected.</p> +"), /* Data review dialog help 1/1 */ "review" : _("<p><b><big>Collected Data Review</big></b><br> Review the data collected by supportconfig. If you do not want to share some of the collected data, -use <b>Remove from Data</b> and selected file will be removed.</p>"), +use <b>Remove from Data</b> and the selected file will be removed.</p> +"), /* Configure1 dialog help 1/3 */ "upload_save" : _("<p><b><big>Upload supportconfig tarball to Novell Technical Support</big></b><br> -If you want to store copy of supportconfig tarball, select target directory and be sure that this option - is checked. -<br></p>") + +If you want to store a copy of the supportconfig tarball, select the target +directory and make sure that this option is checked. +<br></p> +") + /* Configure1 dialog help 2/3 */ _("<p><b><big>Upload URL</big></b><br> -This option has default value where supportconfig tarball will be uploaded. +This option has the location to which the supportconfig tarball will be uploaded +as default value. Change this value only in special cases. -</p>") + +</p> +") + /* Configure1 dialog help 3/3, %1 is a URL */ sformat (_("<p><b><big>Privacy Policy</big></b><br> -You can find the Novell's privacy policy at -<i>%1</i>.</p>"), +Find Novell's privacy policy at +<i>%1</i>.</p> +"), "http://www.novell.com/company/policies/privacy/"), "upload_select" : _("<p><b><big>Upload supportconfig tarball to Novell Technical Support</big></b><br> -If you have supportconfig tarball already created, write full path into <i>Package with log files</i> field. -<br></p>") + +If you have already created the supportconfig tarball, write the full path +into the <i>Package with log files</i> field. +<br></p> +") + /* Configure1 dialog help 2/3 */ _("<p><b><big>Upload URL</big></b><br> -This option has default value where supportconfig tarball will be uploaded. +This option has the location to which the supportconfig tarball will be uploaded +as default value. Change this value only in special cases. -</p>") + +</p> +") + /* Configure1 dialog help 3/3 */ sformat (_("<p><b><big>Privacy Policy</big></b><br> -You can find the Novell's privacy policy at -<i>%1</i>.</p>"), +Find Novell's privacy policy at +<i>%1</i>.</p> +"), "http://www.novell.com/company/policies/privacy/"), /* Configure2 dialog help 1/2 */ Modified: trunk/support/src/supportconfig_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/supportconfig_conf.ycp?rev=67818&r1=67817&r2=67818&view=diff ============================================================================== --- trunk/support/src/supportconfig_conf.ycp (original) +++ trunk/support/src/supportconfig_conf.ycp Thu Mar 29 16:09:30 2012 @@ -14,43 +14,44 @@ "OPTION_EDIR" : _("Novell eDirectory health check information. novell-edir.txt"), "OPTION_ENV" : _("System environment information, including sysctl and root's environment. env.txt"), "OPTION_ETC" : _("Recursively gets *.conf files, along with various other configuration files in /etc. etc.txt"), -"OPTION_EVMS" : _("Enterprise Volume Management System related information. evms.txt"), +"OPTION_EVMS" : _("Enterprise Volume Management System-related information. evms.txt"), "OPTION_HA" : _("Heartbeat/high availabilty cluster information. ha.txt"), "OPTION_ISCSI" : _("iSCSI target and initiator information. fs-iscsi.txt"), "OPTION_LDAP" : _("LDAP related information, including a root DSE search. ldap.txt"), -"OPTION_LUM" : _("Novell Linux User Management related information, including a root DSE, UNIX Config and workstation object searches. novell-lum.txt"), -"OPTION_LVM" : _("Linux Volume Management related information. lvm.txt"), -"OPTION_MEM" : _("Memory related information. memory.txt"), +"OPTION_LUM" : _("Novell Linux User Management-related information, including a root DSE, UNIX Config and workstation object searches. novell-lum.txt"), +"OPTION_LVM" : _("Linux Volume Management-related information. lvm.txt"), +"OPTION_MEM" : _("Memory-related information. memory.txt"), "OPTION_MOD" : _("System kernel module information. modules.txt"), "OPTION_MPIO" : _("Native device mapper multipathing information. mpio.txt"), -"OPTION_NCP" : _("Novell Core Protocol related information. novell-ncp.txt"), -"OPTION_NCS" : _("Novell Cluster Services related information. novell-ncs.txt"), -"OPTION_NET" : _("Network related information, including firewall rules. network.txt"), -"OPTION_NFS" : _("Network File System related information. nfs.txt"), -"OPTION_NSS" : _("Novell Storage Services related information. novell-nss.txt"), -"OPTION_NTP" : _("Network Time Protocol related information. ntp.txt"), -"OPTION_OCFS2" : _("OCFS2 file system related information. ocfs2.txt"), +"OPTION_NCP" : _("Novell Core Protocol-related information. novell-ncp.txt"), +"OPTION_NCS" : _("Novell Cluster Services-related information. novell-ncs.txt"), +"OPTION_NET" : _("Network-related information, including firewall rules. network.txt"), +"OPTION_NFS" : _("Network File System-related information. nfs.txt"), +"OPTION_NSS" : _("Novell Storage Services-related information. novell-nss.txt"), +"OPTION_NTP" : _("Network Time Protocol-related information. ntp.txt"), +"OPTION_OCFS2" : _("OCFS2 file system-related information. ocfs2.txt"), "OPTION_OFILES" : _("List of all open files using lsof. open-files.txt"), -"OPTION_OPENWBEM" : _("OpenWBEM related information. openwbem.txt"), -"OPTION_PAM" : _("Pluggable Authentication Module related information, including user account information. pam.txt"), -"OPTION_PRINT" : _("Printing and CUPS related information. print.txt"), +"OPTION_OPENWBEM" : _("OpenWBEM-related information. openwbem.txt"), +"OPTION_PAM" : _("Pluggable Authentication Module-related information, including user account information. pam.txt"), +"OPTION_PRINT" : _("Printing and CUPS-related information. print.txt"), "OPTION_PROC" : _("Includes key /proc file content. proc.txt"), -"OPTION_RCD" : _("Update daemon related information. updates-daemon.txt"), +"OPTION_RCD" : _("Update daemon-related information. updates-daemon.txt"), "OPTION_RUG" : _("Update client related information. updates.txt"), -"OPTION_SAR" : _("System Activity Reporting related information, including copies of the SAR data files. sar.txt"), -"OPTION_SLERT" : _("SLES Real Time kernel related information. slert.txt"), +"OPTION_SAR" : _("System Activity Reporting-related information, including copies of the SAR data files. sar.txt"), +"OPTION_SLERT" : _("SLES Real Time kernel-related information. slert.txt"), "OPTION_SLP" : _("Service Location Protocol related information. slp.txt"), -"OPTION_SMART" : _("Self-Monitoring, Analysis, and Reporting Technology related information for hard disks. WARNING: Some hard disk controllers and drives do not -behave kindly. Probing SMART data has been known to change file systems to read only mode or even hang the server. Make sure probing SMART data -works in your environment before enabling this option. fs-smartmon.txt"), -"OPTION_SMB" : _("Samba and CIFS related information. samba.txt"), -"OPTION_SRAID" : _("Software RAID related information. fs-softraid.txt"), +"OPTION_SMART" : _("Self-Monitoring, Analysis, and Reporting Technology-related information for hard disks. WARNING: Some hard disk controllers and drives do not +behave nicely. Probing SMART data has been known to change file systems to read only mode or even hang the server. Make sure probing SMART data +works in your environment before enabling this option. fs-smartmon.txt +"), +"OPTION_SMB" : _("Samba and CIFS-related information. samba.txt"), +"OPTION_SRAID" : _("Software RAID-related information. fs-softraid.txt"), "OPTION_SSH" : _("Secure Shell server information. ssh.txt"), "OPTION_SYSCONFIG" : _("Configuration files found in /etc/sysconfig. sysconfig.txt"), -"OPTION_UDEV" : _("UDEV device manager related information. udev.txt"), -"OPTION_X" : _("X graphical system related information. x.txt"), -"OPTION_XEN" : _("XEN virtualization related information. xen.txt"), -"ADD_OPTION_EDIR_SEARCH": _("Tells the supportconfig to search the file system for all eDirectory instances files. If set, ADD_OPTION_FSLIST is automatically set as well. -e"), +"OPTION_UDEV" : _("UDEV device manager-related information. udev.txt"), +"OPTION_X" : _("X graphical system-related information. x.txt"), +"OPTION_XEN" : _("XEN virtualization-related information. xen.txt"), +"ADD_OPTION_EDIR_SEARCH": _("Tells supportconfig to search the file system for all eDirectory instances files. If set, ADD_OPTION_FSLIST is automatically set as well. -e"), "ADD_OPTION_FSLIST" : _("A full file list using find from the root of the filesytem. -L, fs-files.txt"), "ADD_OPTION_LOGS" : _("Includes the entire log file, including comments, instead of just VAR_OPTION_LINE_COUNT lines of it. Additional rotated logs are included if available. -l"), "ADD_OPTION_MIN_DISKSCAN": _("Minimizes the amount of disk information and detailed scanning. -d"), @@ -75,7 +76,7 @@ "VAR_OPTION_SAR_FILES_LIMIT" :_("The maximum number of SAR data files to include in the supportconfig tarball."), -"VAR_OPTION_SILENT" :_("When set to 1, supportconfig runs in quiet mode. This option is useful if you plan on running regular supportconfigs in a cron job for example. Set with -Q."), +"VAR_OPTION_SILENT" :_("When set to 1, supportconfig runs in quiet mode. This option is useful if you\nplan on running supportconfig regularly in a cron job for example. Set with -Q."), "VAR_OPTION_UPLOAD_TARGET" :_("Used to specify where the supportconfig tarball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is Novell's public ftp server.") -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org