March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67819 - in /trunk/sysconfig: package/yast2-sysconfig.changes src/complex.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:10:05 2012 New Revision: 67819 URL: http://svn.opensuse.org/viewcvs/yast?rev=67819&view=rev Log: - merge proofread texts Modified: trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/complex.ycp Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfi… ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Thu Mar 29 16:10:05 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:09:54 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Tue Sep 27 10:44:00 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/sysconfig/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/complex.ycp?rev=67… ============================================================================== --- trunk/sysconfig/src/complex.ycp (original) +++ trunk/sysconfig/src/complex.ycp Thu Mar 29 16:10:05 2012 @@ -754,7 +754,7 @@ ), `VSpacing(1), // help rich text displayed after module start (1/2) - `RichText(`id(`rt), _("System Configuration EditorWith the system configuration editor, you can change some system settings. You can also use YaST2 to configure your hardware and system settings.") + + `RichText(`id(`rt), _("System Configuration EditorWith the system configuration editor, you can change some system settings. You can also use YaST to configure your hardware and system settings.") + // help rich text displayed after module start (2/2) _("Note: Descriptions are not translated because they are read directly from configuration files.")), // push button label - displayed only in autoinstallation config mode -- 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] r67818 - in /trunk/support: package/yast2-support.changes src/Support.ycp src/dialogs.ycp src/helps.ycp src/supportconfig_conf.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

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.ch… ============================================================================== --- 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(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Fri Aug 5 12:35:28 CEST 2011 - tgoettlicher(a)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=6781… ============================================================================== --- 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=6781… ============================================================================== --- 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&… ============================================================================== --- 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" : _("<big>Initializing support Configuration</big> -Please wait... + "read" : _("<big>Initializing Support Configuration</big> + ") + /* Read dialog help 2/2 */ @@ -47,8 +47,8 @@ "), /* Write dialog help 1/2 */ - "write" : _("<big>Saving support Configuration</big> -Please wait... + "write" : _("<big>Saving Support Configuration</big> + ") + /* Write dialog help 2/2 */ @@ -65,7 +65,7 @@ /* Summary dialog help 2/3 */ _("<big>Adding a support:</big> -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 Other (not detected). Then press Configure. ") + @@ -79,9 +79,10 @@ /* Ovreview dialog help 1/3 */ "overview" : _(" <big>Opening Novell Support Center</big> -To start a web browser that opens the Novell Support Center Portal, use Open Novell Support Center. +To start a Web browser that opens the Novell Support Center Portal, use Open Novell Support Center. 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.") +the Service Request number to include in the supportconfig data upload. +") /* Ovreview dialog help 2/3 */ + _("<big>Collecting Data</big> To run the supportconfig data collection tool, use Collect Data") @@ -96,13 +97,15 @@ gather the most data or only gather a minimum amount of data.") /* Configure1 dialog help 2/3 */ + _("<big>Expert Settings</big> -Select Use Custom and the Expert Settings button -to select specific data sets to collect.") +Select Use Custom and click the Expert Settings button +to select specific data sets to collect. +") /* Configure1 dialog help 3/3 */ + _("<big>Options</big> -You can collect additional information. Usually these options are not -necessary, but can be included when circumstances require."), +Collect additional information. Usually these options are not +necessary, but can be included if circumstances require more information. +"), /* Expert dialog help 1/1 */ "expert_params" : _("<big>Default Options</big> @@ -125,49 +128,61 @@ scp://central.server.foo.com/supportconfig/archives") /* Contact dialog help 4/4 */ + _("Note: 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" : _("<big>Collecting Data</big>> -Please wait while the data is being collected."), +Data is being collected. +"), /* Data review dialog help 1/1 */ "review" : _("<big>Collected Data Review</big> Review the data collected by supportconfig. If you do not want to share some of the collected data, -use Remove from Data and selected file will be removed."), +use Remove from Data and the selected file will be removed. +"), /* Configure1 dialog help 1/3 */ "upload_save" : _("<big>Upload supportconfig tarball to Novell Technical Support</big> -If you want to store copy of supportconfig tarball, select target directory and be sure that this option - is checked. - ") + +If you want to store a copy of the supportconfig tarball, select the target +directory and make sure that this option is checked. + +") + /* Configure1 dialog help 2/3 */ _("<big>Upload URL</big> -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. -") + + +") + /* Configure1 dialog help 3/3, %1 is a URL */ sformat (_("<big>Privacy Policy</big> -You can find the Novell's privacy policy at -%1."), +Find Novell's privacy policy at +%1. +"), "http://www.novell.com/company/policies/privacy/"), "upload_select" : _("<big>Upload supportconfig tarball to Novell Technical Support</big> -If you have supportconfig tarball already created, write full path into Package with log files field. - ") + +If you have already created the supportconfig tarball, write the full path +into the Package with log files field. + +") + /* Configure1 dialog help 2/3 */ _("<big>Upload URL</big> -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. -") + + +") + /* Configure1 dialog help 3/3 */ sformat (_("<big>Privacy Policy</big> -You can find the Novell's privacy policy at -%1."), +Find Novell's privacy policy at +%1. +"), "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.y… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67817 - /tags/stable-2_22_0/sudo/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:08:28 2012 New Revision: 67817 URL: http://svn.opensuse.org/viewcvs/yast?rev=67817&view=rev Log: Created tag stable-2_22_0 for sudo Added: tags/stable-2_22_0/sudo/ - copied from r67816, trunk/sudo/ -- 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] r67816 - in /trunk/sudo: VERSION package/yast2-sudo.changes src/Sudo.ycp src/dialog-host.ycp src/dialog-spec.ycp src/dialogs.ycp src/helps.ycp yast2-sudo.spec.in
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:08:03 2012 New Revision: 67816 URL: http://svn.opensuse.org/viewcvs/yast?rev=67816&view=rev Log: - merge proofread texts - confirmed license - 2.22.0 Modified: trunk/sudo/VERSION trunk/sudo/package/yast2-sudo.changes trunk/sudo/src/Sudo.ycp trunk/sudo/src/dialog-host.ycp trunk/sudo/src/dialog-spec.ycp trunk/sudo/src/dialogs.ycp trunk/sudo/src/helps.ycp trunk/sudo/yast2-sudo.spec.in Modified: trunk/sudo/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/VERSION?rev=67816&r1=67815&… ============================================================================== --- trunk/sudo/VERSION (original) +++ trunk/sudo/VERSION Thu Mar 29 16:08:03 2012 @@ -1 +1 @@ -2.21.1 +2.22.0 Modified: trunk/sudo/package/yast2-sudo.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/package/yast2-sudo.changes?… ============================================================================== --- trunk/sudo/package/yast2-sudo.changes (original) +++ trunk/sudo/package/yast2-sudo.changes Thu Mar 29 16:08:03 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 29 16:06:50 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Thu Sep 22 11:39:21 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/sudo/src/Sudo.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/Sudo.ycp?rev=67816&r1=6… ============================================================================== --- trunk/sudo/src/Sudo.ycp (original) +++ trunk/sudo/src/Sudo.ycp Thu Mar 29 16:08:03 2012 @@ -395,7 +395,7 @@ global boolean Abort() { if (Sudo::GetModified()) { - return Popup::YesNo( _("All changes will be lost. Really quit sudo configuration without saving ?")); + return Popup::YesNo( _("All changes will be lost. Really quit sudo configuration without saving?")); } else return true; Modified: trunk/sudo/src/dialog-host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-host.ycp?rev=678… ============================================================================== --- trunk/sudo/src/dialog-host.ycp (original) +++ trunk/sudo/src/dialog-host.ycp Thu Mar 29 16:08:03 2012 @@ -45,7 +45,7 @@ term contents = `VBox ( `Left( `InputField(`id("host_alias_name"),_("Alias Name (in CAPITALS)"))), `Left(`Label(_("Hostnames or Networks in the Alias"))), - `Table(`id("host_alias_members"),`header(_("Host Names/Networks")),[]), + `Table(`id("host_alias_members"),`header(_("Hostnames/Networks")),[]), `Left(`HBox( `PushButton ( `id ( "add_host" ), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton ( `id ( "edit_host" ), `opt(`key_F4), " " + Label::EditButton() + " "), Modified: trunk/sudo/src/dialog-spec.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-spec.ycp?rev=678… ============================================================================== --- trunk/sudo/src/dialog-spec.ycp (original) +++ trunk/sudo/src/dialog-spec.ycp Thu Mar 29 16:08:03 2012 @@ -94,12 +94,12 @@ spec["tag"] = ""; if (spec["user"]:"" == "") { - Popup::Error(_("User name must not be empty.")); + Popup::Error(_("Username must not be empty.")); UI::SetFocus(`id("user_name")); continue; } if (spec["host"]:"" == "") { - Popup::Error(_("Host name must not be empty.")); + Popup::Error(_("Hostname must not be empty.")); UI::SetFocus(`id("host_name")); continue; } @@ -108,7 +108,7 @@ continue; } if (spec["commands"]:[] == [] ) { - Popup::Error(_("Command list must have at least one entry")); + Popup::Error(_("Command list must have at least one entry.")); UI::SetFocus(`id("commands")); continue; } Modified: trunk/sudo/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialogs.ycp?rev=67816&r… ============================================================================== --- trunk/sudo/src/dialogs.ycp (original) +++ trunk/sudo/src/dialogs.ycp Thu Mar 29 16:08:03 2012 @@ -171,8 +171,8 @@ boolean confirm_delete = true; if(Sudo::SearchRules("host",name)) { - if (!Popup::ContinueCancel (sformat(_("Host alias %1 is being used in one of sudo rules. -Deleting it may result in an inconsistent sudo configuration file. Really delete it ? + if (!Popup::ContinueCancel (sformat(_("Host alias %1 is being used in one of the sudo rules. +Deleting it may result in an inconsistent sudo configuration file. Really delete it? "), name))) confirm_delete = false; } @@ -214,8 +214,8 @@ boolean confirm_delete = true; if(Sudo::SearchRules("user",name)) { - if ( !Popup::ContinueCancel (sformat(_("User alias %1 is being used in one of sudo rules . -Deleting it may result in an inconsistent sudo configuration file. Really delete it ? + if ( !Popup::ContinueCancel (sformat(_("User alias %1 is being used in one of the sudo rules. +Deleting it may result in an inconsistent sudo configuration file. Really delete it? "), name))) confirm_delete = false; } @@ -256,8 +256,8 @@ boolean confirm_delete = true; if(Sudo::SearchRules("run_as","(" + name + ")")) { - if (!Popup::ContinueCancel (sformat(_("RunAs alias %1 is being used in one of sudo rules. -Deleting it may result in an inconsistent sudo configuration file. Really delete it ? + if (!Popup::ContinueCancel (sformat(_("RunAs alias %1 is being used in one of the sudo rules. +Deleting it may result in an inconsistent sudo configuration file. Really delete it? "), name))) confirm_delete = false; } @@ -299,8 +299,8 @@ boolean confirm_delete = true; if(Sudo::SearchRules("commands",name)) { - if (!Popup::ContinueCancel (sformat(_("Command alias %1 is being used in one of sudo rules. -Deleting it may result in an inconsistent sudo configuration file. Really delete it ? + if (!Popup::ContinueCancel (sformat(_("Command alias %1 is being used in one of the sudo rules. +Deleting it may result in an inconsistent sudo configuration file. Really delete it? "), name))) confirm_delete = false; } Modified: trunk/sudo/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/helps.ycp?rev=67816&r1=… ============================================================================== --- trunk/sudo/src/helps.ycp (original) +++ trunk/sudo/src/helps.ycp Thu Mar 29 16:08:03 2012 @@ -38,7 +38,7 @@ /* Read dialog help 1/2 */ "read" : _("<big>Initializing sudo Configuration</big> -Please wait... + ") + /* Read dialog help 2/2 */ @@ -48,7 +48,7 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving sudo Configuration</big> -Please wait... + ") + /* Write dialog help 2/2 */ Modified: trunk/sudo/yast2-sudo.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/yast2-sudo.spec.in?rev=6781… ============================================================================== --- trunk/sudo/yast2-sudo.spec.in (original) +++ trunk/sudo/yast2-sudo.spec.in Thu Mar 29 16:08:03 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 Requires: yast2-users # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -- 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] r67815 - in /trunk/sshd: package/yast2-sshd.changes src/dialogs.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:05:31 2012 New Revision: 67815 URL: http://svn.opensuse.org/viewcvs/yast?rev=67815&view=rev Log: - merge proofread texts Modified: trunk/sshd/package/yast2-sshd.changes trunk/sshd/src/dialogs.ycp trunk/sshd/src/helps.ycp Modified: trunk/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/package/yast2-sshd.changes?… ============================================================================== --- trunk/sshd/package/yast2-sshd.changes (original) +++ trunk/sshd/package/yast2-sshd.changes Thu Mar 29 16:05:31 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:05:19 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Mon Sep 26 15:14:18 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/sshd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/dialogs.ycp?rev=67815&r… ============================================================================== --- trunk/sshd/src/dialogs.ycp (original) +++ trunk/sshd/src/dialogs.ycp Thu Mar 29 16:05:31 2012 @@ -81,7 +81,7 @@ _("General Login Settings"), `MarginBox (mbox_x, mbox_y, `VBox ( /* A check box */ - `Left(`CheckBox(`id("PrintMotd"), _("Print &Message of the Day After Login"))), + `Left(`CheckBox(`id("PrintMotd"), _("Print &Message of the Day after Login"))), /* A check box */ `Left(`CheckBox(`id("PermitRootLogin"), _("Permi&t Root Login"))) )) Modified: trunk/sshd/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/helps.ycp?rev=67815&r1=… ============================================================================== --- trunk/sshd/src/helps.ycp (original) +++ trunk/sshd/src/helps.ycp Thu Mar 29 16:05:31 2012 @@ -16,11 +16,13 @@ /* Read dialog help */ "read" : _("<big>Initializing the sshd Configuration</big> -Please wait... "), + +"), /* Write dialog help */ "write" : _("<big>Saving the sshd Configuration</big> -Please wait... "), + +"), /* Server Configuration dialog help */ "server_configuration" : _("<big>Server Configuration</big> @@ -57,7 +59,8 @@ /* Protocol and Cipher Settings dialog help*/ "proto_settings" : _("<big>Protocol and Cipher Settings</big> -Configure SSHD protocol version and cipher settings here. "), +Configure SSHD protocol version and cipher settings. +"), ]; -- 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] r67814 - in /trunk/squid: package/yast2-squid.changes src/Squid.ycp src/SquidACL.ycp src/SquidACL_local_functions.ycp src/dialogs.ycp src/helps.ycp src/store_del.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:05:03 2012 New Revision: 67814 URL: http://svn.opensuse.org/viewcvs/yast?rev=67814&view=rev Log: - merge proofread texts Modified: trunk/squid/package/yast2-squid.changes trunk/squid/src/Squid.ycp trunk/squid/src/SquidACL.ycp trunk/squid/src/SquidACL_local_functions.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/helps.ycp trunk/squid/src/store_del.ycp Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.change… ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Thu Mar 29 16:05:03 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:04:47 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Fri Nov 25 12:25:37 UTC 2011 - coolo(a)suse.com - add libtool as buildrequire to avoid implicit dependency Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=67814&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Thu Mar 29 16:05:03 2012 @@ -1026,20 +1026,20 @@ global boolean Read() { boolean ok = true; - Progress::New(_("Initializing squid Configuration"), + Progress::New(_("Initializing Squid Configuration"), " ", 7, - [_("Read HTTP Ports from config file."), - _("Read Refresh Patterns from config file."), - _("Read ACL Groups from config file."), - _("Read Access Control table from config file."), + [_("Read HTTP Ports from Config File."), + _("Read Refresh Patterns from Config File."), + _("Read ACL Groups from Config File."), + _("Read Access Control Table from Config File."), _("Read Other Settings."), _("Read Service Status."), _("Read Firewall Settings.")], [_("Reading HTTP Ports ..."), _("Reading Refresh Patterns ..."), _("Reading ACL Groups ..."), - _("Reading Access Control table ..."), + _("Reading Access Control Table ..."), _("Reading Other Settings ..."), _("Reading Service Status ..."), _("Reading Firewall Settings ...")], Modified: trunk/squid/src/SquidACL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL.ycp?rev=67814… ============================================================================== --- trunk/squid/src/SquidACL.ycp (original) +++ trunk/squid/src/SquidACL.ycp Thu Mar 29 16:05:03 2012 @@ -122,7 +122,7 @@ "widget_init" : srcdomainWidgetInit, "verification" : srcdomainVerif, "options" : srcdomainOptions, - "help" : _("This type matches against the client's domain name.") ], + "help" : _("This type matches the client's domain name.") ], "dstdomain" : $[ "name" : "dstdomain", "widget" : `Frame( _("dstdomain"), @@ -133,10 +133,10 @@ "widget_init" : srcdomainWidgetInit, "verification" : srcdomainVerif, "options" : srcdomainOptions, - "help" : _("This refers to destination domain i.e. the source domain where the origin server is located.") ], + "help" : _("This refers to the destination domain, i.e. the source domain where the origin server is located.") ], - "srcdom_regex" : regexp("srcdom_regex", "srcdom_regex", _("Matches against the client domain name.")), - "dstdom_regex" : regexp("dstdom_regex", "dstdom_regex", _("Provides match against destination domain.")), + "srcdom_regex" : regexp("srcdom_regex", "srcdom_regex", _("Matches the client domain name.")), + "dstdom_regex" : regexp("dstdom_regex", "dstdom_regex", _("Provides match for destination domain.")), "time" : $[ "name" : "time", "widget" : `Frame( _("time"), @@ -162,7 +162,7 @@ "url_regex" : regexp("url_regex", "url_regex", _("Matches using a regular expression on the complete URL.")), "urlpath_regex" : regexp("urlpath_regex", "urlpath_regex", - _("Matches on the URL path minus any protocol, port, and host name information")), + _("Matches the URL path minus any protocol, port, and host name information")), "port" : $[ "name" : "port", "widget" : `Frame( _("port"), @@ -171,7 +171,7 @@ "widget_init" : portWidgetInit, "verification" : portVerif, "options" : portOptions, - "help" : _("Matches on the destination port for the request.") ], + "help" : _("Matches the destination port for the request.") ], "myport" : $[ "name" : "myport", "widget" : `Frame( _("myport"), @@ -180,7 +180,7 @@ "widget_init" : myportWidgetInit, "verification" : myportVerif, "options" : portOptions, - "help" : _("This provides match against local TCP port number.") ], + "help" : _("Provides match for local TCP port number.") ], "proto" : $[ "name" : "proto", "widget" : `Frame ( _("proto"), @@ -189,7 +189,7 @@ "widget_init" : protoWidgetInit, "verification" : protoVerif, "options" : protoOptions, - "help" : _("Matches on the protocol of the request.") ], + "help" : _("Matches the protocol of the request.") ], "method" : $[ "name" : "method", "widget" : `Frame( _("method"), @@ -207,7 +207,7 @@ "options" : methodOptions, "help" : _("This type matches the HTTP method in the request headers.") ], - "browser" : regexp("browser", "browser", _("A regular expression that matches the clients browser type based on the user agent header.")), + "browser" : regexp("browser", "browser", _("A regular expression that matches the client's browser type based on the user agent header.")), "maxconn" : $[ "name" : "maxconn", "widget" : `Frame("maxconn", @@ -218,7 +218,7 @@ "options" : maxconnOptions, "help" : _("Matches when the client's IP address has more than the specified number of HTTP connections established.") ], - "referer_regex" : regexp("referer_regex", "referer_regex", _("Matches against Referer header.")), + "referer_regex" : regexp("referer_regex", "referer_regex", _("Matches Referer header.")), "req_header" : $[ "name" : "req_header", "widget" : `Frame( "req_header", @@ -231,7 +231,7 @@ "widget_init" : headerWidgetInit, "verification" : headerVerif, "options" : headerOptions, - "help" : _("Regular expression matching against any of the known request headers.") ], + "help" : _("Regular expression matching any of the known request headers.") ], "rep_header" : $[ "name" : "rep_header", "widget" : `Frame( "rep_header", @@ -244,11 +244,12 @@ "widget_init" : headerWidgetInit, "verification" : headerVerif, "options" : headerOptions, - "help" : _("Regular expression matching against the mime type of the reply received by -squid. Can be used to detect file download or some types HTTP tunnelling requests.") ], + "help" : _("Regular expression matching the mime type of the reply received by squid. Can +be used to detect file download or some types of HTTP tunnelling requests. +") ], - "req_mime_type" : regexp("req_mime_type", "req_mime_type", _("Match against the mime type of the request generated by the client.")), - "rep_mime_type" : regexp("rep_mime_type", "rep_mime_type", _("Match against the mime type of the reply received by Squid.")), + "req_mime_type" : regexp("req_mime_type", "req_mime_type", _("Match the mime type of the request generated by the client.")), + "rep_mime_type" : regexp("rep_mime_type", "rep_mime_type", _("Match the mime type of the reply received by Squid.")), "arp" : $[ "name" : "arp", "widget" : `Frame( "arp", Modified: trunk/squid/src/SquidACL_local_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL_local_functio… ============================================================================== --- trunk/squid/src/SquidACL_local_functions.ycp (original) +++ trunk/squid/src/SquidACL_local_functions.ycp Thu Mar 29 16:05:03 2012 @@ -314,7 +314,7 @@ Report::Error( _("You must select at least one day.")); }else if (!isHHMMFormat(from) || !isHHMMFormat(to)){ ok = false; - Report::Error( _("Time is not filled in correct format.")); + Report::Error( _("Time is not set in correct format.")); }else if (!isCorrectFromTo(from, to)){// from must be less then to ok = false; Report::Error( _("From must be less than To."));//TODO: better error message Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=67814&… ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Thu Mar 29 16:05:03 2012 @@ -253,7 +253,7 @@ `TextEntry(`id("cache_store_log"), _("Cache &Store Log"), ""), `Bottom(`PushButton(`id(`cache_store_log_browse), Label::BrowseButton())) )), - `Left(`CheckBox(`id("emulate_httpd_log"), _("&Emulate Httpd Log?"))) + `Left(`CheckBox(`id("emulate_httpd_log"), _("&Emulate httpd Log?"))) ) ); } @@ -284,9 +284,9 @@ _("&Language of error messages"), []), `VSpacing(), - `TextEntry(`id("cache_mgr"), _("&Administrator's e-mail"), ""), + `TextEntry(`id("cache_mgr"), _("&Administrator's email"), ""), `VSpacing(), - `Left(`CheckBox(`id("ftp_passive"), _("&Use Ftp Passive Mode"))) + `Left(`CheckBox(`id("ftp_passive"), _("&Use FTP Passive Mode"))) ))); } Modified: trunk/squid/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helps.ycp?rev=67814&r1… ============================================================================== --- trunk/squid/src/helps.ycp (original) +++ trunk/squid/src/helps.ycp Thu Mar 29 16:05:03 2012 @@ -35,8 +35,8 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<big>Initializing squid Configuration</big> -Please wait... + "read" : _("<big>Initializing Squid Configuration</big> + ") + /* Read dialog help 2/2 */ _("<big>Aborting Initialization:</big> @@ -44,8 +44,8 @@ "), /* Write dialog help 1/2 */ - "write" : _("<big>Saving squid Configuration</big> -Please wait... + "write" : _("<big>Saving Squid Configuration</big> + ") + /* Write dialog help 2/2 */ _("<big>Aborting Saving:</big> @@ -56,53 +56,62 @@ /* Summary dialog help */ "summary" : _("<big>Squid Configuration</big> -Configure squid here. +Configure Squid here. "), /* Ovreview dialog help */ "overview" : _("<big>Squid Configuration Overview</big> -Obtain an overview of installed squids. Additionally -edit their configurations. +Obtain an overview of installed squids and +edit their configurations if necessary. "), /* Http Ports Dialog */ "http_ports" : -_("Here you can define all ports where Squid will -listen for clients http requests.") + -_("Host can contain hostname or ip address -or it can be leaved empty."), +_("Define all ports where Squid will +listen for clients' http requests. +") + +_("Host can contain a hostname or IP address +or remain empty. +"), /* Cache Dialog */ "cache" : -_("Refresh Patterns define the manner -how Squid treats the objects in the cache.") + +_("Refresh Patterns define how Squid treats the objects in the cache. +") + _("The refresh patterns are checked in the order listed here. -The first entry which matches is used.") + -_("Min determines how long (in minutes) should be an object -considered fresh if no explicit expire time given.") + -_("Percent is percentage of the objects age (time since last -modification) an object without explicit expire time will be -considered fresh.") + -_("Max is upper limit on how long objects without an explicit -expiry time will be considered fresh."), +The first matching entry is used. +") + +_("Min determines how long (in minutes) an object should be +considered fresh if no explicit expiry time is given. +") + +_("Percent is the percentage of the object's age (time since last +modification). An object without explicit expiry time will be +considered fresh. +") + +_("Max is the upper limit of how long objects without an explicit +expiry time will be considered fresh. +"), /* Cache 2 Dialog */ "cache2" : _("Cache memory defines the ideal amount of memory to be used for objects.") + -_("Max Object Size defines maximum size for objects to be stored -in the disk. Objects larger than this size will not be saved on disk.") + -_("Min Object Size specifies the minimum object size below which -will not be saved to the disk.") + +_("Max Object Size defines the maximum size for objects to be stored +on the disk. Objects larger than this size will not be saved on disk. +") + +_("Min Object Size specifies the minimum size for objects. Smaller +objects will not be saved to the disk. +") + _("Replacement begins when the swap (disk) usage is above the Swap Low-Water Mark and attempts to maintain utilization near the Swap Low-Water Mark. As swap utilization gets close to -Swap High-Water Mark object eviction becomes more aggressive. -If utilization is close to the Swap Low-Water Mark less replacement -is done each time.") + +Swap High-Water Mark, object eviction becomes more aggressive. +If utilization is close to the Swap Low-Water Mark, less replacement +is done each time. +") + _("Cache Replacement Policy determines which objects are to be replaced when disk space is needed. Memory Replacement Policy specifies the policy for object replacement in @@ -132,35 +141,43 @@ "cache_directory" : _("Directory Name defines a top-level directory where cache swap files will be stored.") + _("Size defines the amount of disk space (in MB) to use under this directory.") + -_("Level 1 Directories defines number of first-level subdirectories which -will be created under the Directory Name directory.") + -_("Level 2 Directories defines number of second-level subdirectories which will be created -under each first-level directory."), +_("Level 1 Directories defines a number of first-level subdirectories, +which will be created under the Directory Name directory. +") + +_("Level 2 Directories defines a number of second-level subdirectories, +which will be created under each first-level directory. +"), /* ACL Groups */ "acl_groups" : -_("Access to Squid server can be controlled via ACL Groups.") + -_("ACL Group has various types and description of ACL Group depends -on the particular type."), +_("Access to the Squid server can be controlled via ACL Groups.") + +_("ACL Group has various types and the description of ACL Group depends +on the particular type. +"), "http_access" : -_("In the Access Control table access can be denied or allowed to ACL Groups. +_("In the Access Control table, access can be denied or allowed to ACL Groups. If there are more ACL Groups in one line, it means that access will be allowed -or denied for those who belong to all ACL Groups at the same time.") + -_("Access Control table is checked in the order listed here. -The first entry which matches is used."), +or denied to members who belong to all ACL Groups at the same time. +") + +_("The Access Control table is checked in the order listed here. +The first matching entry is used. +"), /* Logging and Timeouts Dialog */ "logging" : -_("Access Log defines the file where client activities are logged.") + -_("Cache Log defines the file where general information about your -cache's behavior is logged.") + -_("Cache Store Log defines the location where the transaction log of all -objects that are stored in the object store, as well as the time when the object -gets deleted. This option can be left empty.") + -_("Emulate Httpd Log allows you to specify that Squid write its -Access Log in HTTPD common log file format."), +_("Access Log defines the file in which client activities are logged.") + +_("Cache Log defines the file in which general information about your +cache's behavior is logged. +") + +_("Cache Store Log defines the location of the transaction log of all +objects that are stored in the object store, as well as the time when an object +gets deleted. This option can be left empty. +") + +_("With Emulate httpd Log specify that Squid writes its +Access Log in HTTPD common log file format. +"), "timeouts" : _("Connection Timeout is an option to force Squid to close connections after a specified time.") + @@ -170,8 +187,9 @@ /* Miscellaneous Dialog */ "miscellaneous" : -_("Administrator's e-mail is the address which will be added to any -error pages that are displayed to clients. Defaults to either webmaster.") +_("Administrator's email is the address which will be added to any +error pages that are displayed to clients. Defaults to webmaster. +") ]; Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=6781… ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Thu Mar 29 16:05:03 2012 @@ -60,7 +60,7 @@ } if (size(host) > 0 && !isCorrectHost(host)){ error_msg = error_msg + (size(error_msg)>0 ? "\n" : "") + - _("Host must contain valid ip address or hostname."); + _("Host must contain valid IP address or hostname."); ok = false; } @@ -168,7 +168,9 @@ if (max_obj_size > cache_mem + cache_dir_mbytes){ ok = false; - Report::Error( _("Cache Memory + Size of Cache Directory\nmust be more than Max Object Size.")); + Report::Error( _("Cache Memory + Size of Cache Directory +must be higher than Max Object Size. +")); } } @@ -210,7 +212,9 @@ if (max_obj_size > cache_mem + cache_dir_mbytes){ ok = false; - Report::Error( _("Cache Memory + Size of Cache Directory\nmust be more than Max Object Size.")); + Report::Error( _("Cache Memory + Size of Cache Directory +must be higher than Max Object Size. +")); } } } @@ -331,8 +335,10 @@ if (error){ ok = false; Report::Error( sformat (_("ACL Group '%1' already exists with different type.\n"), name) - + sformat (_("ACL Group '%1' has to have type '%2'.\n" ), name, existed_type ) - + _("If you want to change type of this ACL Group you must\ndelete other ACL Groups with same name before that.") ); + + sformat (_("ACL Group '%1' must have type '%2'.\n"), name, existed_type ) + + _("If you want to change the type of this ACL Group, you must +delete other ACL Groups with the same name before that. +") ); } } @@ -340,14 +346,16 @@ if (ok && id_item != nil && old_name != name && Squid::NumACLs(id_item) == 1){ //test if changed ACL is used in http_access option. if (size(affected_options) > 0 && contains(affected_options, "http_access")){ - Report::Error( _("You can not change name of this ACL Group, because \nit's used in Access Control table.\n") + Report::Error( _("You can not change the name of this ACL Group, because +it is used in the Access Control table. +") + _("If you want to change name of this ACL Group you must\ndelete all of its occurrences in Access Control table.")); ok = false; }else //test if changed ACL is used in other option (not managed by thid module) if (size(affected_options) > 0){ if (!Report::AnyQuestion(Label::WarningMsg(), - _("If you change name of this ACL Group these options might be affected: \n") + _("If you change the name of this ACL Group, these options might be affected: \n") + " " + mergestring(affected_options, ",\n ") + ".\n", _("Change name anyway"), _("Do not change name"), @@ -390,10 +398,12 @@ if (contains(affected_options, "http_access")){ //Report::Error( _("This ACL Group can't be deleted.\nIt's used in Access Control table.")); - Report::Error( _("You must not delete this ACL Group, because \nit's used in Access Control table.\n") + Report::Error( _("You must not delete this ACL Group, because +it is used in the Access Control table. +") + _("If you want to change name of this ACL Group you must\ndelete all of its occurrences in Access Control table.")); }else{ - string message = _("If you delete this ACL Group these options might be affected: \n") + string message = _("If you delete this ACL Group, these options might be affected: \n") + " " + mergestring(affected_options, ",\n ") + ".\n";// + //_("Are you sure you want to delete this ACL Group?"); if (Report::AnyQuestion(Label::WarningMsg(), @@ -500,7 +510,7 @@ if (regexpmatch(cache_mgr, "[ \t\n]")){ ok = false; - Report::Error( _("Administrator's E-mail must not contain any white spaces.")); + Report::Error( _("Administrator's email must not contain any white spaces.")); } return ok; -- 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] r67813 - in /trunk/sound: package/yast2-sound.changes sound/src/texts.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:04:24 2012 New Revision: 67813 URL: http://svn.opensuse.org/viewcvs/yast?rev=67813&view=rev Log: - merge proofread texts Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/texts.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu Mar 29 16:04:24 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:04:11 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Tue Mar 20 10:50:14 CET 2012 - aschnell(a)suse.de - fixed for gcc 4.7 Modified: trunk/sound/sound/src/texts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/texts.ycp?rev=67… ============================================================================== --- trunk/sound/sound/src/texts.ycp (original) +++ trunk/sound/sound/src/texts.ycp Thu Mar 29 16:04:24 2012 @@ -282,8 +282,9 @@ Use Play Test Sound to test the selected card. \n") + -_("PulseAudio daemon can used to play sounds, -use PulseAudio Configuration to enable or disable it.") + +_("PulseAudio daemon can be used to play sounds. +Use PulseAudio Configuration to enable or disable it. +") + _("The sound device with index 0 is the default device used by system and applications. Use Other to set the selected sound device as the primary device.") -- 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] r67812 - /tags/stable-2_22_4/snapper/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:02:05 2012 New Revision: 67812 URL: http://svn.opensuse.org/viewcvs/yast?rev=67812&view=rev Log: Created tag stable-2_22_4 for snapper Added: tags/stable-2_22_4/snapper/ - copied from r67811, trunk/snapper/ -- 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] r67811 - in /trunk/snapper: VERSION package/yast2-snapper.changes src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:01:29 2012 New Revision: 67811 URL: http://svn.opensuse.org/viewcvs/yast?rev=67811&view=rev Log: - merge proofread texts - 2.22.4 Modified: trunk/snapper/VERSION trunk/snapper/package/yast2-snapper.changes trunk/snapper/src/dialogs.ycp Modified: trunk/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/VERSION?rev=67811&r1=678… ============================================================================== --- trunk/snapper/VERSION (original) +++ trunk/snapper/VERSION Thu Mar 29 16:01:29 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/package/yast2-snapper.ch… ============================================================================== --- trunk/snapper/package/yast2-snapper.changes (original) +++ trunk/snapper/package/yast2-snapper.changes Thu Mar 29 16:01:29 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 16:01:03 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts +- 2.22.4 + +------------------------------------------------------------------- Mon Jan 16 15:06:11 CET 2012 - jsuchome(a)suse.cz - when reverting changes to selected snapshot, delete files as well Modified: trunk/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/dialogs.ycp?rev=6781… ============================================================================== --- trunk/snapper/src/dialogs.ycp (original) +++ trunk/snapper/src/dialogs.ycp Thu Mar 29 16:01:29 2012 @@ -406,7 +406,7 @@ } // button label - string restore_label = _("R&estore From First"); + string restore_label = _("R&estore from First"); // button label string restore_label_single = _("Restore"); @@ -421,7 +421,7 @@ `VSquash (`HBox ( `HStretch (), type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), restore_label), - `PushButton (`id (`restore), type == `SINGLE ? restore_label_single : _("Res&tore From Second")) + `PushButton (`id (`restore), type == `SINGLE ? restore_label_single : _("Res&tore from Second")) )) ), `HSpacing (0.5)) ); -- 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] r67810 - /tags/stable-2_22_4/security/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:00:15 2012 New Revision: 67810 URL: http://svn.opensuse.org/viewcvs/yast?rev=67810&view=rev Log: Created tag stable-2_22_4 for security Added: tags/stable-2_22_4/security/ - copied from r67809, trunk/security/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0