Author: jsuchome Date: Mon Jan 4 10:51:26 2010 New Revision: 60212 URL: http://svn.opensuse.org/viewcvs/yast?rev=60212&view=rev Log: - returned keyboard desktop file, adapted help text (bnc#560713) - 2.19.4 Added: trunk/country/keyboard/src/keyboard.desktop Modified: trunk/country/VERSION trunk/country/keyboard/src/dialogs.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=60212&r1=60211&r2=60212&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Jan 4 10:51:26 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/country/keyboard/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/dialogs.ycp?rev=60212&r1=60211&r2=60212&view=diff ============================================================================== --- trunk/country/keyboard/src/dialogs.ycp (original) +++ trunk/country/keyboard/src/dialogs.ycp Mon Jan 4 10:51:26 2010 @@ -208,24 +208,36 @@ // help text for keyboard screen (header) string help_text = _(" -<p><big><b>Keyboard Configuration</b></big></p>") + +<p><big><b>Keyboard Configuration</b></big></p>"); - // help text for keyboard screen - _("<p> + if (Stage::initial () || Stage::firstboot ()) + { + + help_text = help_text + + // help text for keyboard screen (installation) + _("<p> Choose the <b>Keyboard Layout</b> to use for installation and in the installed system. Test the layout in <b>Test</b>. For advanced options, such as repeat rate and delay, select <b>Expert Settings</b>. </p> "); - - // general help trailer - help_text = help_text + _("<p> + // general help trailer + help_text = help_text + _("<p> If unsure, use the default values already selected. </p>"); + } + else + help_text = help_text + + // help text for keyboard screen (installation) + _("<p> +Choose the <b>Keyboard Layout</b> to use in the system. +For advanced options, such as repeat rate and delay, select <b>Expert Settings</b>.</p> +<p>Find more options as well as more layouts in the keyboard layout tool of your desktop environment.</p> +"); // Screen title for keyboard screen - Wizard::SetContents ( _("Keyboard Configuration"), contents, help_text, + Wizard::SetContents ( _("System Keyboard Configuration"), contents, help_text, args["enable_back"]:true, args["enable_next"]:true); Wizard::SetDesktopIcon("keyboard"); Added: trunk/country/keyboard/src/keyboard.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/keyboard.desktop?rev=60212&view=auto ============================================================================== --- trunk/country/keyboard/src/keyboard.desktop (added) +++ trunk/country/keyboard/src/keyboard.desktop Mon Jan 4 10:51:26 2010 @@ -0,0 +1,28 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=keyboard + +X-SuSE-YaST-Group=Hardware +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst=all +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=keyboard +X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=keyboard.rnc +X-SuSE-YaST-Keywords=keyboard + +Icon=yast-keyboard +Exec=/sbin/yast2 keyboard + +Name=System Keyboard Layout +GenericName=Select the system keyboard +X-KDE-SubstituteUID=true +StartupNotify=true Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=60212&r1=60211&r2=60212&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Jan 4 10:51:26 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 4 10:47:25 CET 2010 - jsuchome@suse.cz + +- returned keyboard desktop file, adapted help text (bnc#560713) +- 2.19.4 + +------------------------------------------------------------------- Fri Dec 4 14:11:30 CET 2009 - jsuchome@suse.cz - install ntp together with yast2-ntp-client (bnc#560732) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org