# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: nick.ellery@ubuntu.com-20080910011543-p33kcuk5e94yrrh3
# target_branch: bzr+ssh://nick.ellery@bazaar.launchpad.net/%7Eubuntu-\
#   core-doc/ubuntu-doc/ubuntu-intrepid/
# testament_sha1: b3ac32450bc45f27ed5114b79e791f03779877dc
# timestamp: 2008-09-09 18:16:22 -0700
# base_revision_id: asommer@ubuntu.com-20080908201005-tak0i2mb9ndyednn
# 
# Begin patch
=== modified file 'desktop-effects/C/desktop-effects.xml'
--- desktop-effects/C/desktop-effects.xml	2008-07-11 22:04:00 +0000
+++ desktop-effects/C/desktop-effects.xml	2008-09-10 01:15:43 +0000
@@ -39,13 +39,13 @@
 		<para>Press &desktop-effects; to change basic options relating to visual effects.</para>
 		<itemizedlist>
 			<listitem>
-			<para>Select <guilabel>No effects</guilabel> to disable visual effects.</para>
-			</listitem>
-			<listitem>
-			<para>Select <guilabel>Normal effects</guilabel> to enable basic visual effects.</para>
-			</listitem>
-			<listitem>
-			<para>Select <guilabel>Extra effects</guilabel> to enable more advanced visual effects.</para>
+			<para>Select <guilabel>None</guilabel> to provide a simple desktop environment without any effects.</para>
+			</listitem>
+			<listitem>
+			<para>Select <guilabel>Normal</guilabel> to provide a good balance between attractiveness and performance.</para>
+			</listitem>
+			<listitem>
+			<para>Select <guilabel>Extra</guilabel> to provide an aesthetically pleasing set of graphics.</para>
 			</listitem>
 		</itemizedlist>
 		<para>When you select a new option, it may take several seconds for the change to be applied automatically. During this time, your screen may flicker briefly.  Once the settings have been applied successfully, you will see a dialog box asking your confirmation to either keep the new settings or to revert to your previous settings. If you find that the new settings work correctly, then click 'Keep Settings'. Otherwise click 'Use Previous Settings'. You will be taken back to your previous settings if you do not select anything for 40 seconds.</para>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSJhLTIAAabfgAAwUWP//1IB
CAC/7//wUAP5eyOZNw2FdmElCCYJ6KP1ME0jynqaGgGg0CSQEMmqfqT9KnoyID1PU9Ro0ZDRhIk0
jVT9TNR5FNPKN6hGjRtMpjUAY0NDQAZDQAAAAASSTJpoyQ1H6VPTU/SnptU9Qeo02oyGNJiW5Gb6
tkLjmVKLIas6a7UkCdsXbcI/rxPD3ts5cDnNzsOHEuVx8i985pwmHGr1pfrnhxvmX7ucTFgnSMPf
Y0LlNrt524c24nCJhySZhByDMwynKBFd0mPXgelEG1Wu+OhGrINyVgbS38irpKxKArxuuvzQQhPt
IVRSt5TcpWShkIXyUFEFLihbQ7ypmutay2EJiqui9rVgpFUajc1oVy5Yj0LhUOuhaeg8vOkTv/CF
msh4F7x5kdxAJGBMmprkGTUT0nSMxYVJuNAMR4PPhUzPVVFdcPLY59ysJb7TPLEWcKbFMvTjUueJ
u82YkAl+tDQVCm+UnbD34uRWpfqu8dfiVdCaZNKryI9gDA/ER2ZEnPcZkSslqwtig6A8Vsh9TZSo
yyp1rgodJiFfp19OzgU3LyO5m1Oo2mfdltHhm3375bfgzE8Q7Y5H28ZtBbYoavVa1uwTFjIM9Xnl
Zot1XwMDV5w0bIqQC53lknH/uLaGqzqPCix7unbuI5Unk8a9RXYWuOZkt2fzse85JiSjUTZ+fgkc
QfmeNaEypcz1gwHikTduT2R1Fe4jIp9TccyCequoREPIvI4l0ifXBmreJMWLlTlCtOV/AYx1R1D3
WFommmR7D7TOmIM4DgjRG/vT+kNhhbcM1F+LRKkLOnXQ1MRPjulkVPg5oQAxJUXyrfsdfZUBQpcq
7TIyKiI3pPGo+NN1e1qnWnrHAUZ3KZZzCZaDJoXs1TclNzHpqBw/yPaukzsPqLtTy+JBZ8PTEJRA
0QcgiH05Og/MRvWIv4LXIIokmUlGziL5Cs4OTWKYGhkW9oJY2f6J80iAcUc1accVOeJZ7BeEeZAd
g+TAeA8IB+1AgW0gdfbE800dVmpFzJmRVIcnU13qN1NvFI4JrwcwdONvm16GBgfgGyxU5yTlsg4W
wuKc53BdN8jImwex7+itLTQaK/qyut52YMniageVX9GFP7zoysvqJo6YIsnwhklsFA7lfCY0n2W0
YSxuhvxZgRlqApei9StdEVCaIZrfGrcoj/kd6s6GgVlYynHq06yR2SC0FBeCIBotaumhibKmrkik
CSR/P2IxxFoLuukStutROTUA2XU3dgguvhlJo1c5gMl5aibPaeM/cXckU4UJAiYS0yA=