Author: jsuchome
Date: Sun Mar 30 20:47:18 2008
New Revision: 45872
URL: http://svn.opensuse.org/viewcvs/yast?rev=45872&view=rev
Log:
- merged proofread texts
- 2.16.5
Modified:
trunk/add-on-creator/VERSION
trunk/add-on-creator/package/yast2-add-on-creator.changes
trunk/add-on-creator/src/AddOnCreator.ycp
trunk/add-on-creator/src/add-on-creator.ycp
trunk/add-on-creator/src/complex.ycp
trunk/add-on-creator/src/helps.ycp
Modified: trunk/add-on-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=45872&r1=45871&r2=45872&view=diff
==============================================================================
--- trunk/add-on-creator/VERSION (original)
+++ trunk/add-on-creator/VERSION Sun Mar 30 20:47:18 2008
@@ -1 +1 @@
-2.16.4
+2.16.5
Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=45872&r1=45871&r2=45872&view=diff
==============================================================================
--- trunk/add-on-creator/package/yast2-add-on-creator.changes (original)
+++ trunk/add-on-creator/package/yast2-add-on-creator.changes Sun Mar 30 20:47:18 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sun Mar 30 20:44:45 CEST 2008 - jsuchome@suse.cz
+
+- merged proofread texts
+- 2.16.5
+
+-------------------------------------------------------------------
Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz
- added 'StartupNotify=true' to the desktop file (bnc #304964)
Modified: trunk/add-on-creator/src/AddOnCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=45872&r1=45871&r2=45872&view=diff
==============================================================================
--- trunk/add-on-creator/src/AddOnCreator.ycp (original)
+++ trunk/add-on-creator/src/AddOnCreator.ycp Sun Mar 30 20:47:18 2008
@@ -218,7 +218,7 @@
// labeliption of content file PREREQUIRES key
"label" : _("Resolvables needed before installation"),
// help text for content file 'PREREQUIRES' key
- "help" : _("Resolvables that must be installed on the system before installation of this product. The syntax is the same as for <b>REQUIRES</b>."),
+ "help" : _("Resolvables that must be installed on the system before the installation of this product. The syntax is the same as for <b>REQUIRES</b>."),
],
"LABEL" : $[
"key" : "LABEL",
@@ -232,7 +232,7 @@
// label of content file PROVIDES key
"label" : _("Resolvables provided"),
// help text for content file 'PROVIDES' key
- "help" : _("Capabilities this product provides. They can be used to match <b>REQUIRES</b> from others. Every resolvable has a provides by default--its own name and edition. For example, package <i>bar-1.42-1</i> provides the capability <tt>bar = 1.42-1</tt>."),
+ "help" : _("Capabilities this product provides. They can be used to match <b>REQUIRES</b> from others. Every resolvable has a provides by default- its own name and edition. For example, package <i>bar-1.42-1</i> provides the capability <tt>bar = 1.42-1</tt>."),
],
"CONFLICTS" : $[
"key" : "CONFLICTS",
@@ -319,7 +319,7 @@
// label of content file 'PATTERNS' key
"label" : _("Preselected patterns"),
// help text for content file 'PATTERNS' key
- "help" : _("List of patterns pre-selected by the product."),
+ "help" : _("List of patterns preselected by the product."),
],
"SHORTLABEL" : $[
"key" : "SHORTLABEL",
@@ -396,7 +396,7 @@
// help text for 'Des' pattern key
"help" :_("Multiple line description in the default language"),
// help text for 'Des.lang' pattern key
- "lang_help" :_("Multiple line description, language specific.")
+ "lang_help" :_("Multiple line description, language-specific.")
],
"Cat" : $[
// label for 'Cat' pattern key
@@ -521,7 +521,7 @@
// label for 'Fre' pattern key
"label" : _("Freshen"),
// help text for 'Fre' pattern key
- "help" : _("The current pattern is only considered for installation is the pattern specified here is installed."),
+ "help" : _("The current pattern is only considered for installation if the pattern specified here is installed."),
"defval" : "",
"type" : "pattern-list",
],
@@ -569,7 +569,7 @@
// label for 'Eul' key
"label" : _("EULA"),
// help text for 'Eul' key
- "help" : _("Text of the EULA. This text is displayed before package installation. If the user does not accept the EULA, package is not installed."),
+ "help" : _("Text of the EULA. This text is displayed before the package installation. If the user does not accept the EULA, the package is not installed."),
"type" : "multiline",
],
];
@@ -1299,8 +1299,9 @@
Progress::New (caption, " ", size (stages),
(list<string>) stages, (list<string>) steps,
// help text
- _("<b>Generating data for Add-On</b><br>
-Please wait..."));
+ _("<b>Generating Data for Add-On</b><br>
+Please wait...
+"));
Progress::NextStage();
map arch_map = $[];
Modified: trunk/add-on-creator/src/add-on-creator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creator.ycp?rev=45872&r1=45871&r2=45872&view=diff
==============================================================================
--- trunk/add-on-creator/src/add-on-creator.ycp (original)
+++ trunk/add-on-creator/src/add-on-creator.ycp Sun Mar 30 20:47:18 2008
@@ -422,7 +422,7 @@
CommandLine::Print (sformat (_("(%1) Product Name: %2"),
i, cont["PRODUCT"]:""));
// command line summary
- CommandLine::Print (sformat (_("\tVersion : %1"), cont["VERSION"]:""));
+ CommandLine::Print (sformat (_("\tVersio: %1"), cont["VERSION"]:""));
// command line summary
CommandLine::Print (sformat (_("\tInput directory: %1"),
add_on["rpm_path"]:""));
@@ -448,7 +448,7 @@
if (size (add_on_products) == 0)
{
// command line message, do not translate 'create', 'clone'
- Report::Error (_("There is no Add-On Product configuration present. Create a new one using 'create' or 'clone' command."));
+ Report::Error (_("There is no add-on product configuration present. Create a new one using 'create' or 'clone' command."));
return false;
}
integer number = options["number"]:0;
@@ -459,7 +459,7 @@
else
{
// error message
- Report::Error (_("Specify Add-On Product that should be built."));
+ Report::Error (_("Specify add-on product that should be built."));
return false;
}
}
@@ -488,14 +488,14 @@
if (size (add_on_products) == 0)
{
// command line message
- Report::Error (_("There is no Add-On Product configuration present."));
+ Report::Error (_("There is no add-on product configuration present."));
return false;
}
integer number = options["number"]:0;
if (number < 1)
{
// error message
- Report::Error (_("Specify Add-On Product configuration that should be deleted."));
+ Report::Error (_("Specify add-on product configuration that should be deleted."));
return false;
}
// !!! numbers are shown starting from 1, list is indexed from 0 !!!
@@ -514,12 +514,12 @@
"create" : $[
"handler" : CreateAddOn,
// command line help text for 'create' action
- "help" : _("Create and build new Add-On Product"),
+ "help" : _("Create and build new add-on product"),
],
"clone" : $[
"handler" : CloneAddOn,
// command line help text for 'clone' action
- "help" : _("Create and build new Add-On Product based on an existing one"),
+ "help" : _("Create and build new add-on product based on an existing one"),
],
"sign" : $[
"handler" : SignAddOn,
@@ -529,17 +529,17 @@
"list" : $[
"handler" : ListAddOns,
// command line help text for 'list' action
- "help" : _("List available Add-On Product configurations"),
+ "help" : _("List available add-on product configurations"),
],
"build" : $[
"handler" : BuildAddOnHandler,
// command line help text for 'create' action
- "help" : _("Build Add-On Product from selected configuration"),
+ "help" : _("Build add-on product from selected configuration"),
],
"delete" : $[
"handler" : DeleteAddOn,
// command line help text for 'create' action
- "help" : _("Delete selected Add-On Product configuration"),
+ "help" : _("Delete selected add-on product configuration"),
],
],
"options" : $[
@@ -655,7 +655,7 @@
],
"number" : $[
// help text for 'number' option; do not translate 'list'
- "help" : _("Number of selected Add-On (see 'list' command for product numbers)"),
+ "help" : _("Number of selected add-on (see 'list' command for product numbers)"),
"type" : "integer"
],
],
Modified: trunk/add-on-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?rev=45872&r1=45871&r2=45872&view=diff
==============================================================================
--- trunk/add-on-creator/src/complex.ycp (original)
+++ trunk/add-on-creator/src/complex.ycp Sun Mar 30 20:47:18 2008
@@ -141,16 +141,16 @@
}
// help text
- string help_text = _("<p>Start the creating of new Add-On Product configuration with <b>Add</b>.</p>") +
+ string help_text = _("<p>Start the creating of new add-on product configuration with <b>Add</b>.</p>") +
// help text
- _("<p>Use <b>Edit</b> to modify selected Add-On Product configuration.</p>") +
+ _("<p>Use <b>Edit</b> to modify selected add-on product configuration.</p>") +
// help text
_("<p>Delete the selected configuration using <b>Delete</b>.</p>") +
// help text
- _("<p>Build the fresh Add On Product based on selected configuration with <b>Build</b>.</p>");
+ _("<p>Build the fresh add-on product based on selected configuration with <b>Build</b>.</p>");
term contents = `VBox (
`VWeight (3, `Table (`id (`table), `opt (`notify, `immediate),
@@ -1550,7 +1550,7 @@
{
// error popup (see Name, Comment, Email Adress text entries
Popup::Error (_("Name, comment, and e-mail address values are empty.
-You must enter at least one of the them to provide user identification.
+You must enter at least one of them to provide user identification.
"));
continue;
}
Modified: trunk/add-on-creator/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/helps.ycp?rev=45872&r1=45871&r2=45872&view=diff
==============================================================================
--- trunk/add-on-creator/src/helps.ycp (original)
+++ trunk/add-on-creator/src/helps.ycp Sun Mar 30 20:47:18 2008
@@ -42,7 +42,7 @@
"),
// Write dialog help
- "write" : _("<p><b>Writing Add-On configurations</b><br>
+ "write" : _("<p>Writing add-on configurations<br>
Please wait...<br></p>
"),
@@ -88,7 +88,7 @@
_("<p>Use <b>Import</b> to import an existing <tt>content</tt> file.</p>"),
// help text for package description files
- "packages" : _("<p>Here, edit the language-specific descriptions of packages (<tt>packages.lang</tt> files).</p>") +
+ "packages" : _("<p>Edit the language-specific descriptions of packages (<tt>packages.lang</tt> files) here.</p>") +
// help text for package description files, cont.
_("<p>Use <b>Add Language</b> to add a description file for a new language. The list of available languages is read from the <b>LINGUAS</b> value of the <tt>content</tt> file. Import an existing file with package descriptions with <b>Import</b>. Delete the description file with <b>Delete</b>.</p>") +
@@ -99,7 +99,7 @@
_("<p>Optionally, choose the path for the file providing <b>Additional Package Dependencies</b> (EXTRA_PROV).</p>"),
// help text for patterns
- "patterns" : _("<p>Here, create and edit the patterns for the add-on product.</p>") +
+ "patterns" : _("<p>Create and edit the patterns for the add-on product here.</p>") +
// help text for patterns, cont.
_("<p>Use <b>New</b> to create a new pattern or <b>Import</b> to import an existing one.</p>") +
@@ -124,7 +124,7 @@
_("<p>Enter the location of the file with the workflow description. This file is an alternative to <tt>control.xml</tt> and is saved as <tt>installation.xml</tt> in the add-on product's base directory.</p>") +
// workflow help text
- _("<p>To use custom YaST modules during installation of the add-on product, enter the path to the <tt>y2update.tgz</tt> archive where these modules are stored or configure the contents of <tt>y2update.tgz</tt> by specifying the YaST RPM packages in <b>Import the Packages</b>.</p>"),
+ _("<p>To use custom YaST modules during the installation of the add-on product, enter the path to the <tt>y2update.tgz</tt> archive where these modules are stored or configure the contents of <tt>y2update.tgz</tt> by specifying the YaST RPM packages in <b>Import the Packages</b>.</p>"),
// help text for expert dialog 1
"expert" : _("<p>The optional <tt>info.txt</tt> file gives information about the add-on that should be displayed as a pop-up window with an <b>OK</b> button.</p>") +
@@ -141,7 +141,7 @@
_("<p>Enter the passphrase needed to unlock the secret key.</p>") +
// help text for signing dialog, cont.
- _("<p>Select if you want to <b>sign all packages</b> of the add-on product with selected key. All previous package signatures will be removed.</p>"),
+ _("<p>Select if you want to <b>Sign All Packages</b> of the add-on product with selected key. All previous package signatures will be removed.</p>"),
// help text for generating new key dialog
"generate" : _("<p>Enter the values necessary for generating the new primary key pair.</p>") +
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org