- reindent file

1 files changed, 119 insertions, 72 deletions

diff --git a/data/menus/xfce-applications.menu b/data/menus/xfce-applications.menu
index 3972c81..cbe1f28 100644
--- a/data/menus/xfce-applications.menu
+++ b/data/menus/xfce-applications.menu
@@ -4,71 +4,72 @@
 <!-- AUTHOR tpg@mandriva.org -->
 
 <Menu>
-    <Name>Xfce</Name>
-    
-    <DefaultMergeDirs/>
-    <DefaultAppDirs/>
-    <DefaultDirectoryDirs/>
+  <Name>Xfce</Name>
+
+  <DefaultMergeDirs/>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+
+  <Include>
+    <Category>X-Xfce-Toplevel</Category>
+  </Include>
 
+  <Layout>
+    <Filename>xfce4-run.desktop</Filename>
+    <Separator/>
+    <Filename>exo-terminal-emulator.desktop</Filename>
+    <Filename>exo-file-manager.desktop</Filename>
+    <Filename>exo-mail-reader.desktop</Filename>
+    <Filename>exo-web-browser.desktop</Filename>
+    <Separator/>
+    <Menuname>Settings</Menuname>
+    <Separator/>
+    <Menuname>Internet</Menuname>
+    <Menuname>Office</Menuname>
+    <Menuname>Graphics</Menuname>
+    <Menuname>SoundVideo</Menuname>
+    <Menuname>Tools</Menuname>
+    <Menuname>Development</Menuname>
+    <Menuname>Games</Menuname>
+    <Menuname>Education</Menuname>
+    <Menuname>Sciences</Menuname>
+    <Menuname>Documentation</Menuname>
+    <Merge type="menus"/>
+    <Separator/>
+    <Filename>rpmdrake.desktop</Filename>
+    <Separator/>
+    <Filename>xfhelp4.desktop</Filename>
+    <Filename>xfce4-about.desktop</Filename>
+    <Filename>xfce4-session-logout.desktop</Filename>
+  </Layout>
+    
+  <Menu>
+    <Name>Settings</Name>
+    <Directory>xfce-settings.directory</Directory>
     <Include>
-        <Category>X-Xfce-Toplevel</Category>
+      <Category>DesktopSettings</Category>
     </Include>
-
+        
     <Layout>
-        <Filename>xfce4-run.desktop</Filename>
-        <Separator/>
-        <Filename>exo-terminal-emulator.desktop</Filename>
-        <Filename>exo-file-manager.desktop</Filename>
-        <Filename>exo-mail-reader.desktop</Filename>
-        <Filename>exo-web-browser.desktop</Filename>
-        <Separator/>
-        <Menuname>Settings</Menuname>
-        <Separator/>
-	<Menuname>Internet</Menuname>
-	<Menuname>Office</Menuname>
-	<Menuname>Graphics</Menuname>
-	<Menuname>SoundVideo</Menuname>
-	<Menuname>Tools</Menuname>
-	<Menuname>Development</Menuname>
-	<Menuname>Games</Menuname>
-	<Menuname>Education</Menuname>
-	<Menuname>Sciences</Menuname>
-	<Menuname>Documentation</Menuname>
-        <Merge type="menus"/>
-	<Separator/>
-	<Filename>rpmdrake.desktop</Filename>
-	<Separator/>
-        <Filename>xfhelp4.desktop</Filename>
-        <Filename>xfce4-about.desktop</Filename>
-        <Filename>xfce4-session-logout.desktop</Filename>
+      <Filename>xfce-settings-manager.desktop</Filename>
+      <Separator/>
+      <Merge type="all"/>
     </Layout>
-    
-    <Menu>
-        <Name>Settings</Name>
-        <Directory>xfce-settings.directory</Directory>
-        <Include>
-            <Category>DesktopSettings</Category>
-        </Include>
-        
-        <Layout>
-            <Filename>xfce-settings-manager.desktop</Filename>
-            <Separator/>
-            <Merge type="all"/>
-        </Layout>
         
-        <Menu>
-            <Name>Screensavers</Name>
-            <Directory>xfce-screensavers.directory</Directory>
-            <Include>
-                <Category>Screensaver</Category>
-            </Include>
-        </Menu>
+    <Menu>
+      <Name>Screensavers</Name>
+      <Directory>xfce-screensavers.directory</Directory>
+      <Include>
+        <Category>Screensaver</Category>
+      </Include>
     </Menu>
+  </Menu>
     
-   <Include>
+  <Include>
     <Category>X-MandrivaLinux</Category>
     <Filename>rpmdrake.desktop</Filename>
   </Include>
+
   <Menu>
     <Name>Internet</Name>
     <Directory>mandriva-internet.directory</Directory>
@@ -111,6 +112,7 @@
         </Not>
       </And>
     </Include>
+
     <Menu>
       <Name>More</Name>
       <Directory>mandriva-internet-more.directory</Directory>
@@ -119,11 +121,11 @@
         <And>
           <Or>
             <Not>
-		<Category>XFCE</Category>
-                <Category>GNOME</Category>
-                <Category>GTK</Category>
-                <Category>X-MageiaLinux-CrossDesktop</Category>
-                <Category>X-MandrivaLinux-CrossDesktop</Category>
+              <Category>XFCE</Category>
+              <Category>GNOME</Category>
+              <Category>GTK</Category>
+              <Category>X-MageiaLinux-CrossDesktop</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
             </Not>
             <Category>X-MandrivaLinux-More</Category>
           </Or>
@@ -136,7 +138,7 @@
     </Menu>
   </Menu>
    
-	 <Menu>
+  <Menu>
     <Name>Office</Name>
     <Directory>mandriva-office.directory</Directory>
     <Layout>
@@ -201,6 +203,7 @@
         </Not>
       </And>
     </Include>
+
     <Menu>
       <Name>More</Name>
       <Directory>mandriva-office-more.directory</Directory>
@@ -229,7 +232,7 @@
     </Menu>
   </Menu>
 
-	<Menu>
+  <Menu>
     <Name>Graphics</Name>
     <Directory>mandriva-graphics.directory</Directory>
     <Include>
@@ -266,6 +269,7 @@
         </Not>
       </And>
     </Include>
+
     <Menu>
       <Name>More</Name>
       <Directory>mandriva-graphics-more.directory</Directory>
@@ -274,13 +278,13 @@
         <And>
           <Or>
             <Not>
-	      <Category>XFCE</Category>
+              <Category>XFCE</Category>
               <Category>GNOME</Category>
               <Category>GTK</Category>
               <Category>X-MageiaLinux-CrossDesktop</Category>
               <Category>X-MandrivaLinux-CrossDesktop</Category>
             </Not>
-            <Category>X-MandrivaLinux-More</Category>
+          <Category>X-MandrivaLinux-More</Category>
           </Or>
           <Category>Graphics</Category>
         </And>
@@ -288,7 +292,7 @@
     </Menu>
   </Menu>
 
-	 <Menu>
+  <Menu>
     <Name>SoundVideo</Name>
     <Directory>mandriva-soundvideo.directory</Directory>
     <Include>
@@ -326,13 +330,15 @@
           <Category>Audio</Category>
           <Category>Video</Category>
         </Or>
-<!--    <Not>
+        <!--    
+        <Not>
           <Category>X-MandrivaLinux-More</Category>
           <Category>DiscBurning</Category>
         </Not> 
--->
+        -->
       </And>
     </Include>
+
     <Menu>
       <Name>More</Name>
       <Directory>mandriva-soundvideo-more.directory</Directory>
@@ -363,7 +369,7 @@
     </Menu>
   </Menu>
  
-		 <Menu>
+  <Menu>
     <Name>Tools</Name>
     <Directory>mandriva-tools.directory</Directory>
     <Layout>
@@ -446,6 +452,7 @@
     <Exclude>
       <Filename>xfce4-about.desktop</Filename>
     </Exclude>
+
     <Menu>
       <Name>SystemTools</Name>
       <Directory>mandriva-systemtools.directory</Directory>
@@ -498,6 +505,7 @@
         <Filename>rpmdrake.desktop</Filename>
       </Exclude>
     </Menu>
+
     <Menu>
       <Name>Accessibility</Name>
       <Directory>mandriva-accessibility.directory</Directory>
@@ -512,6 +520,7 @@
         </And>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Emulators</Name>
       <Directory>mandriva-emulators.directory</Directory>
@@ -519,6 +528,7 @@
         <Category>Emulator</Category>
       </Include>
     </Menu>
+
     <!-- always present, just to ensure GNOME preferences don't appear in any menu -->
     <Menu>
       <Name>GNOME Preferences</Name>
@@ -535,12 +545,14 @@
         <Category>X-MandrivaLinux-System-Configuration-GNOME</Category>
       </Include>
     </Menu>
+
     <!-- always present, just to ensure KDE preferences don't appear in any menu -->
     <Menu>
       <Name>KDE Info Center</Name>
       <Directory>mandriva-system-configuration-kde.directory</Directory>
       <MergeFile>/etc/xdg/menus/kde-information.menu</MergeFile>
     </Menu>
+
     <Menu>
       <Name>More</Name>
       <Directory>mandriva-tools-more.directory</Directory>
@@ -620,6 +632,7 @@
         </Not>
       </And>
     </Include>
+
     <Menu>
       <Name>Databases</Name>
       <Directory>mandriva-development-databases.directory</Directory>
@@ -630,6 +643,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Development Environments</Name>
       <Directory>mandriva-development-developmentenvironments.directory</Directory>
@@ -641,6 +655,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Web Development</Name>
       <Directory>mandriva-development-webdevelopment.directory</Directory>
@@ -651,6 +666,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Tools</Name>
       <Directory>mandriva-development-tools.directory</Directory>
@@ -672,7 +688,6 @@
     </Menu>
   </Menu>
 
-
   <Menu>
     <Name>Games</Name>
     <Layout>
@@ -695,6 +710,7 @@
         <Category>Game</Category>
       </Or>
     </Include>
+
     <Menu>
       <Name>Adventure</Name>
       <Directory>mandriva-games-adventure.directory</Directory>
@@ -705,6 +721,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Arcade</Name>
       <Directory>mandriva-games-arcade.directory</Directory>
@@ -715,6 +732,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Boards</Name>
       <Directory>mandriva-games-boards.directory</Directory>
@@ -725,6 +743,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Cards</Name>
       <Directory>mandriva-games-cards.directory</Directory>
@@ -735,6 +754,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Puzzles</Name>
       <Directory>mandriva-games-puzzles.directory</Directory>
@@ -746,6 +766,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Sports</Name>
       <Directory>mandriva-games-sports.directory</Directory>
@@ -756,6 +777,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Strategy</Name>
       <Directory>mandriva-games-strategy.directory</Directory>
@@ -766,6 +788,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Other</Name>
       <Directory>mandriva-games-other.directory</Directory>
@@ -783,6 +806,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Toys</Name>
       <Directory>mandriva-games-toys.directory</Directory>
@@ -794,7 +818,7 @@
       </Include>
     </Menu>
   </Menu>
-		
+
   <Menu>
     <Name>Education</Name>
     <Layout>
@@ -817,6 +841,7 @@
         <Category>Education</Category>
       </Or>
     </Include>
+
     <Menu>
       <Name>Economy</Name>
       <Directory>mandriva-education-economy.directory</Directory>
@@ -827,6 +852,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Geography</Name>
       <Directory>mandriva-education-geography.directory</Directory>
@@ -837,6 +863,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>History</Name>
       <Directory>mandriva-education-history.directory</Directory>
@@ -847,6 +874,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Languages</Name>
       <Directory>mandriva-education-languages.directory</Directory>
@@ -857,6 +885,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Literature</Name>
       <Directory>mandriva-education-literature.directory</Directory>
@@ -867,6 +896,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Sciences</Name>
       <Directory>mandriva-education-sciences.directory</Directory>
@@ -880,6 +910,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Sports</Name>
       <Directory>mandriva-education-sports.directory</Directory>
@@ -890,6 +921,7 @@
         </Or>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Other</Name>
       <Directory>mandriva-education-other.directory</Directory>
@@ -935,6 +967,7 @@
       <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
       <Category>Science</Category>
     </Include>
+
     <Menu>
       <Name>Artificial Intelligence</Name>
       <Directory>mandriva-sciences-artificialintelligence.directory</Directory>
@@ -943,6 +976,7 @@
         <Category>ArtificialIntelligence</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Astronomy</Name>
       <Directory>mandriva-sciences-astronomy.directory</Directory>
@@ -951,6 +985,7 @@
         <Category>Astronomy</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Biology</Name>
       <Directory>mandriva-sciences-biology.directory</Directory>
@@ -959,6 +994,7 @@
         <Category>Biology</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Chemistry</Name>
       <Directory>mandriva-sciences-chemistry.directory</Directory>
@@ -967,6 +1003,7 @@
         <Category>Chemistry</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Computer Science</Name>
       <Directory>mandriva-sciences-computerscience.directory</Directory>
@@ -975,6 +1012,7 @@
         <Category>ComputerScience</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Data Visualization</Name>
       <Directory>mandriva-sciences-datavisualization.directory</Directory>
@@ -983,6 +1021,7 @@
         <Category>DataVisualization</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Electricity</Name>
       <Directory>mandriva-sciences-electricity.directory</Directory>
@@ -991,6 +1030,7 @@
         <Category>Electricity</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Geosciences</Name>
       <Directory>mandriva-sciences-geosciences.directory</Directory>
@@ -1000,6 +1040,7 @@
         <Category>Geology</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Image Processing</Name>
       <Directory>mandriva-sciences-imageprocessing.directory</Directory>
@@ -1008,6 +1049,7 @@
         <Category>ImageProcessing</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Mathematics</Name>
       <Directory>mandriva-sciences-mathematics.directory</Directory>
@@ -1016,6 +1058,7 @@
         <Category>Math</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Numeric Analysis</Name>
       <Directory>mandriva-sciences-numericanalysis.directory</Directory>
@@ -1025,6 +1068,7 @@
         <Category>NumericalAnalysis</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Parallel Computing</Name>
       <Directory>mandriva-sciences-parallelcomputing.directory</Directory>
@@ -1033,6 +1077,7 @@
         <Category>ParallelComputing</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Physics</Name>
       <Directory>mandriva-sciences-physics.directory</Directory>
@@ -1041,6 +1086,7 @@
         <Category>Physics</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Robotics</Name>
       <Directory>mandriva-sciences-robotics.directory</Directory>
@@ -1049,6 +1095,7 @@
         <Category>Robotics</Category>
       </Include>
     </Menu>
+
     <Menu>
       <Name>Other</Name>
       <Directory>mandriva-sciences-other.directory</Directory>
@@ -1061,7 +1108,7 @@
     </Menu>
   </Menu>
 
-			 <Menu>
+  <Menu>
     <Name>Documentation</Name>
     <Directory>mandriva-documentation.directory</Directory>
     <Include>
@@ -1076,10 +1123,10 @@
     <Directory>mandriva-other.directory</Directory>
     <OnlyUnallocated/>
     <Include>
-	    <All/>
+      <All/>
     </Include>
     <Exclude>
-	    <Category>Core</Category>
+      <Category>Core</Category>
     </Exclude>
   </Menu>
 -->