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.changes?rev=67814&r1=67813&r2=67814&view=diff ============================================================================== --- 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@suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Fri Nov 25 12:25:37 UTC 2011 - coolo@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=67813&r2=67814&view=diff ============================================================================== --- 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&r1=67813&r2=67814&view=diff ============================================================================== --- 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_functions.ycp?rev=67814&r1=67813&r2=67814&view=diff ============================================================================== --- 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&r1=67813&r2=67814&view=diff ============================================================================== --- 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=67813&r2=67814&view=diff ============================================================================== --- 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" : _("<p><b><big>Initializing squid Configuration</big></b><br> -Please wait...<br></p> + "read" : _("<p><b><big>Initializing Squid Configuration</big></b><br> +</p> ") + /* Read dialog help 2/2 */ _("<p><b><big>Aborting Initialization:</big></b><br> @@ -44,8 +44,8 @@ "), /* Write dialog help 1/2 */ - "write" : _("<p><b><big>Saving squid Configuration</big></b><br> -Please wait...<br></p> + "write" : _("<p><b><big>Saving Squid Configuration</big></b><br> +</p> ") + /* Write dialog help 2/2 */ _("<p><b><big>Aborting Saving:</big></b><br> @@ -56,53 +56,62 @@ /* Summary dialog help */ "summary" : _("<p><b><big>Squid Configuration</big></b><br> -Configure squid here.<br></p> +Configure Squid here.<br></p> "), /* Ovreview dialog help */ "overview" : _("<p><b><big>Squid Configuration Overview</big></b><br> -Obtain an overview of installed squids. Additionally -edit their configurations.<br></p> +Obtain an overview of installed squids and +edit their configurations if necessary.<br></p> "), /* Http Ports Dialog */ "http_ports" : -_("<p>Here you can define all ports where Squid will -listen for clients http requests.</p>") + -_("<p><b>Host</b> can contain hostname or ip address -or it can be leaved empty.</p>"), +_("<p>Define all ports where Squid will +listen for clients' http requests.</p> +") + +_("<p><b>Host</b> can contain a hostname or IP address +or remain empty.</p> +"), /* Cache Dialog */ "cache" : -_("<p><b>Refresh Patterns</b> define the manner -how Squid treats the objects in the cache.</p>") + +_("<p><b>Refresh Patterns</b> define how Squid treats the objects in the cache.</p> +") + _("<p>The refresh patterns are checked in the order listed here. -The first entry which matches is used.</p>") + -_("<p><b>Min</b> determines how long (in minutes) should be an object -considered fresh if no explicit expire time given.") + -_("<p><b>Percent</b> is percentage of the objects age (time since last -modification) an object without explicit expire time will be -considered fresh.</p>") + -_("<p><b>Max</b> is upper limit on how long objects without an explicit -expiry time will be considered fresh.</p>"), +The first matching entry is used.</p> +") + +_("<p><b>Min</b> determines how long (in minutes) an object should be +considered fresh if no explicit expiry time is given. +") + +_("<p><b>Percent</b> is the percentage of the object's age (time since last +modification). An object without explicit expiry time will be +considered fresh.</p> +") + +_("<p><b>Max</b> is the upper limit of how long objects without an explicit +expiry time will be considered fresh.</p> +"), /* Cache 2 Dialog */ "cache2" : _("<p><b>Cache memory</b> defines the ideal amount of memory to be used for objects.</p>") + -_("<p><b>Max Object Size</b> defines maximum size for objects to be stored -in the disk. Objects larger than this size will not be saved on disk.</p>") + -_("<p><b>Min Object Size</b> specifies the minimum object size below which -will not be saved to the disk.</p>") + +_("<p><b>Max Object Size</b> defines the maximum size for objects to be stored +on the disk. Objects larger than this size will not be saved on disk.</p> +") + +_("<p><b>Min Object Size</b> specifies the minimum size for objects. Smaller +objects will not be saved to the disk.</p> +") + _("<p>Replacement begins when the swap (disk) usage is above the <b>Swap Low-Water Mark</b> and attempts to maintain utilization near the <b>Swap Low-Water Mark</b>. As swap utilization gets close to -<b>Swap High-Water Mark</b> object eviction becomes more aggressive. -If utilization is close to the <b>Swap Low-Water Mark</b> less replacement -is done each time.") + +<b>Swap High-Water Mark</b>, object eviction becomes more aggressive. +If utilization is close to the <b>Swap Low-Water Mark</b>, less replacement +is done each time. +") + _("<p><b>Cache Replacement Policy</b> determines which objects are to be replaced when disk space is needed. <b>Memory Replacement Policy</b> specifies the policy for object replacement in @@ -132,35 +141,43 @@ "cache_directory" : _("<p><b>Directory Name</b> defines a top-level directory where cache swap files will be stored.</p>") + _("<p><b>Size</b> defines the amount of disk space (in MB) to use under this directory.</p>") + -_("<p><b>Level 1 Directories</b> defines number of first-level subdirectories which -will be created under the <b>Directory Name</b> directory.</p>") + -_("<p><b>Level 2 Directories</b> defines number of second-level subdirectories which will be created -under each first-level directory.</p>"), +_("<p><b>Level 1 Directories</b> defines a number of first-level subdirectories, +which will be created under the <b>Directory Name</b> directory.</p> +") + +_("<p><b>Level 2 Directories</b> defines a number of second-level subdirectories, +which will be created under each first-level directory.</p> +"), /* ACL Groups */ "acl_groups" : -_("<p>Access to Squid server can be controlled via <b>ACL Groups</b>.</p>") + -_("<p><b>ACL Group</b> has various types and description of ACL Group depends -on the particular type.</p>"), +_("<p>Access to the Squid server can be controlled via <b>ACL Groups</b>.</p>") + +_("<p><b>ACL Group</b> has various types and the description of ACL Group depends +on the particular type.</p> +"), "http_access" : -_("<p>In the <b>Access Control</b> table access can be denied or allowed to ACL Groups. +_("<p>In the <b>Access Control</b> 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.</p>") + -_("<p><b>Access Control</b> table is checked in the order listed here. -The first entry which matches is used.</p>"), +or denied to members who belong to all ACL Groups at the same time.</p> +") + +_("<p>The <b>Access Control</b> table is checked in the order listed here. +The first matching entry is used.</p> +"), /* Logging and Timeouts Dialog */ "logging" : -_("<p><b>Access Log</b> defines the file where client activities are logged.</p>") + -_("<p><b>Cache Log</b> defines the file where general information about your -cache's behavior is logged.</p>") + -_("<p><b>Cache Store Log</b> 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.</p>") + -_("<p><b>Emulate Httpd Log</b> allows you to specify that Squid write its -<b>Access Log</b> in HTTPD common log file format.</p>"), +_("<p><b>Access Log</b> defines the file in which client activities are logged.</p>") + +_("<p><b>Cache Log</b> defines the file in which general information about your +cache's behavior is logged.</p> +") + +_("<p><b>Cache Store Log</b> 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.</p> +") + +_("<p>With <b>Emulate httpd Log</b> specify that Squid writes its +<b>Access Log</b> in HTTPD common log file format.</p> +"), "timeouts" : _("<p><b>Connection Timeout</b> is an option to force Squid to close connections after a specified time.</p>") + @@ -170,8 +187,9 @@ /* Miscellaneous Dialog */ "miscellaneous" : -_("<p><b>Administrator's e-mail</b> is the address which will be added to any -error pages that are displayed to clients. Defaults to either webmaster.</p>") +_("<p><b>Administrator's email</b> is the address which will be added to any +error pages that are displayed to clients. Defaults to webmaster.</p> +") ]; Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=67814&r1=67813&r2=67814&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org