add help texts for category filter

yast · Oct 23, 2012 · ffbf68b · ffbf68b
1 parent 4c3d54d
commit ffbf68b
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/dialogs/OUCDialogs.ycp b/src/dialogs/OUCDialogs.ycp
@@ -38,12 +38,8 @@ string filterByCategory = _("Filter by Category");
 // for category filter //translators: means: categories of patches
 string patchCategories = _("Patch Categories");
 
-string help_title = sformat( "<p><b>%1</b></p>", moduleTitle);
-string help_para1 = sformat(_("<p>In <b>%1</b> the current update repository is shown.</p>"), updateRepository );
-string help_para2 = sformat(_("<p>Press <b>%1</b> to use the default update repository.</p>"), setDefaultButtonLabel );
-string help_para3 = sformat(_("<p>Find related actions in the <b>%1</b> menu.</p>"), advancedMenuButtonLabel );
-string help_para4 = sformat(_("<p>In <b>%1</b> set up the automatic online update. Choose the interval to use and if interactive patches should be ignored, otherwise the updater will use the default answers.</p>"), automaticOnlineUpdate   );
-
+string enabledMsg  = _("enabled");
+string disabledMsg = _("disabled");
 
 string editSoftwareRepositories = _("Edit Software Repositories");
 string registerForSupport       = _("Register for support and get update repository");
@@ -56,22 +52,27 @@ string currentUpdateRepo        = _("Current Update Repository:");
 string needToRegister           = _("In order to add the default update repository\nyou have to register this product.");
 string runRegistrationNow       = _("Do you want to perform the registration now?");
 
-
-
-string enabledMsg  = _("enabled");
-string disabledMsg = _("disabled");
+string help_title = sformat( "<p><b>%1</b></p>", moduleTitle);
+string help_para1 = sformat(_("<p>In <b>%1</b> the current update repository is shown.</p>"), updateRepository );
+string help_para2 = sformat(_("<p>Press <b>%1</b> to use the default update repository.</p>"), setDefaultButtonLabel );
+string help_para3 = sformat(_("<p>Find related actions in the <b>%1</b> menu.</p>"), advancedMenuButtonLabel );
+string help_para4 = sformat(_("<p>In <b>%1</b> set up the automatic online update.</p>"), automaticOnlineUpdate);
+string help_para5 = sformat(_("<p>Select an update interval and specify if interactive patches should be ignored and if licenses should be automatically agreed with.</p>"));
+string help_para6 = sformat(_("<p>All packages that are recommended by an updated package will be installed when <b>%1</b> is enabled.</p>"), includeRecommends);
+string help_para7 = sformat(_("<p>Category filter for patches can be configured in the section <b>%1</b>. Only patches of the listed categories will be installed. Others will be skipped.</p>"), patchCategories);
 
 
 string getOUCHelp(symbol type)
 {
     if (type == `autoyast)
     {
-        //return help_title + help_para1 + help_para2 + help_para3 + help_para4;
-        return help_title + help_para4 + help_para3;
+        return help_title + help_para4 + help_para5 + help_para6 + help_para7;
     }
     else
     {
-        return help_title + help_para4;
+        // disabled as the setting of the default update repo is not possible
+        //return help_title + help_para1 + help_para2 + help_para3 + help_para4 + help_para5 + help_para6 + help_para7;
+        return help_title + help_para4 + help_para5 + help_para6 + help_para7;
     }
     return "";
 }