fixed xmllint --validate issues reported by krazy

svn path=/trunk/KDE/kdebase/apps/; revision=973297

diff --git a/src/panels/folders/dolphin_folderspanelsettings.kcfg b/src/panels/folders/dolphin_folderspanelsettings.kcfg
index 816d783c883c57768aa357018455262f1dc2248f..53e48c326e93058fe8438651d73786ff51037e59 100644 (file)
--- a/src/panels/folders/dolphin_folderspanelsettings.kcfg
+++ b/src/panels/folders/dolphin_folderspanelsettings.kcfg
@@ -4,7 +4,7 @@
     <kcfgfile name="dolphinrc"/>
     <group name="FoldersPanel">
         <entry name="ShowHiddenFiles" type="Bool">
-            <label context="@label">Show hidden files</label>
+            <label>Show hidden files</label>
             <default>false</default>
         </entry>
     </group>

diff --git a/src/panels/information/dolphin_informationpanelsettings.kcfg b/src/panels/information/dolphin_informationpanelsettings.kcfg
index a30bee65d59b09c7ea053607f3275492161026ab..ebd921eefffaeb2ed197899c704673753f063268 100644 (file)
--- a/src/panels/information/dolphin_informationpanelsettings.kcfg
+++ b/src/panels/information/dolphin_informationpanelsettings.kcfg
@@ -4,19 +4,19 @@
     <kcfgfile name="dolphinrc"/>
     <group name="InformationPanel">
         <entry name="showPreview" type="Bool">
-            <label context="@label">Show preview</label>
+            <label>Show preview</label>
             <default>true</default>
         </entry>
         <entry name="showRating" type="Bool">
-            <label context="@label">Show rating</label>
+            <label>Show rating</label>
             <default>true</default>
         </entry>
         <entry name="showComment" type="Bool">
-            <label context="@label">Show comment</label>
+            <label>Show comment</label>
             <default>true</default>
         </entry>
         <entry name="showTags" type="Bool">
-            <label context="@label">Show tags</label>
+            <label>Show tags</label>
             <default>true</default>
         </entry>
     </group>

diff --git a/src/settings/dolphin_columnmodesettings.kcfg b/src/settings/dolphin_columnmodesettings.kcfg
index 4fd5ecc6ee44b6ce8faa46a807215840bbb2d09d..498671efac25b7ee87ba67687669e282bf46ce1c 100644 (file)
--- a/src/settings/dolphin_columnmodesettings.kcfg
+++ b/src/settings/dolphin_columnmodesettings.kcfg
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <kcfg>
-    <kcfgfile name="dolphinrc"/>
     <include>kiconloader.h</include>
     <include>kglobalsettings.h</include>
+    <kcfgfile name="dolphinrc"/>
     <group name="ColumnMode">
         <entry name="FontFamily" type="String">
-            <label context="@label">Font family</label>
+            <label>Font family</label>
             <default code="true">KGlobalSettings::generalFont().family()</default>
         </entry>
         <entry name="UseSystemFont" type="Bool">
-            <label context="@label">Use system font</label>
+            <label>Use system font</label>
             <default>true</default>
         </entry>
         <entry name="FontSize" type="Int">
-            <label context="@label">Font size</label>
+            <label>Font size</label>
             <default code="true">KGlobalSettings::generalFont().pointSize()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
-            <label context="@label Font style">Italic</label>
+            <label>Italic</label>
             <default>false</default>
         </entry>
         <entry name="FontWeight" type="Int">
-            <label context="@label">Font weight</label>
+            <label>Font weight</label>
             <default>0</default>
         </entry>
         <entry name="IconSize" type="Int">
-            <label context="@label">Icon size</label>
+            <label>Icon size</label>
             <default code="true">KIconLoader::SizeSmall</default>
         </entry>
         <entry name="PreviewSize" type="Int">
-            <label context="@label">Preview size</label>
+            <label>Preview size</label>
             <default code="true">KIconLoader::SizeLarge</default>
         </entry>
         <entry name="ColumnWidth" type="Int">
-            <label context="@label">Column width</label>
+            <label>Column width</label>
             <default>250</default>
         </entry>
     </group>

diff --git a/src/settings/dolphin_detailsmodesettings.kcfg b/src/settings/dolphin_detailsmodesettings.kcfg
index 780d70540c016a3a90feea5d1591f462eb084018..590623185045e1ce7d33974bf20c228bad31c0c0 100644 (file)
--- a/src/settings/dolphin_detailsmodesettings.kcfg
+++ b/src/settings/dolphin_detailsmodesettings.kcfg
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <kcfg>
-    <kcfgfile name="dolphinrc"/>
     <include>kiconloader.h</include>
     <include>kglobalsettings.h</include>
+    <kcfgfile name="dolphinrc"/>
     <group name="DetailsMode">
         <entry name="FontFamily" type="String">
-            <label context="@label">Font family</label>
+            <label>Font family</label>
             <default code="true">KGlobalSettings::generalFont().family()</default>
         </entry>
         <entry name="UseSystemFont" type="Bool">
-            <label context="@label">Use system font</label>
+            <label>Use system font</label>
             <default>true</default>
         </entry>
         <entry name="FontSize" type="Int">
-            <label context="@label">Font size</label>
+            <label>Font size</label>
             <default code="true">KGlobalSettings::generalFont().pointSize()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
-            <label context="@label Font style">Italic</label>
+            <label>Italic</label>
             <default>false</default>
         </entry>
         <entry name="FontWeight" type="Int">
-            <label context="@label">Font weight</label>
+            <label>Font weight</label>
             <default>0</default>
         </entry>
         <entry name="IconSize" type="Int">
-            <label context="@label">Icon size</label>
+            <label>Icon size</label>
             <default code="true">KIconLoader::SizeSmall</default>
         </entry>
         <entry name="PreviewSize" type="Int">
-            <label context="@label">Preview size</label>
+            <label>Preview size</label>
             <default code="true">KIconLoader::SizeLarge</default>
         </entry>
         <entry name="ExpandableFolders" type="Bool">
-            <label context="@label">Expandable folders</label>
+            <label>Expandable folders</label>
             <default>false</default>
         </entry>
     </group>

diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index 0222fa89c67a4e1bf0a45690363af64ab8862c94..18a81168f50eeeb7bfaf1b92631c5ee9c55f2306 100644 (file)
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <kcfg>
-    <kcfgfile name="dolphinrc"/>
     <include>QDir</include>
     <include>kglobalsettings.h</include>
+    <kcfgfile name="dolphinrc"/>
     <group name="General">
         <entry name="EditableUrl" type="Bool">
-            <label context="@label">Should the URL be editable for the user</label>
+            <label>Should the URL be editable for the user</label>
             <default>false</default>
         </entry>
         <entry name="UrlCompletionMode" type="Enum">
-            <label context="@label">Text completion mode of the URL Navigator</label>
+            <label>Text completion mode of the URL Navigator</label>
             <default code="true">KGlobalSettings::completionMode()</default>
         </entry>
         <entry name="ShowFullPath" type="Bool">
-            <label context="@label">Should the full path be shown inside the location bar</label>
+            <label>Should the full path be shown inside the location bar</label>
             <default>false</default>
         </entry>
         <entry name="FirstRun" type="Bool">
-            <label context="@label">Is the application started the first time</label>
+            <label>Is the application started the first time</label>
             <default>true</default>
         </entry>
         <entry name="HomeUrl" type="String">
-            <label context="@label">Home URL</label>
+            <label>Home URL</label>
             <default code="true">QDir::homePath()</default>
         </entry>
         <entry name="SplitView" type="Bool">
-            <label context="@label">Split the view into two panes</label>
+            <label>Split the view into two panes</label>
             <default>false</default>
         </entry>
         <entry name="FilterBar" type="Bool">
-            <label context="@label">Should the filter bar be shown</label>
+            <label>Should the filter bar be shown</label>
             <default>false</default>
         </entry>
         <entry name="GlobalViewProps" type="Bool">
-            <label context="@label">Should the view properties be used for all directories</label>
+            <label>Should the view properties be used for all directories</label>
             <default>false</default>
         </entry>
         <entry name="BrowseThroughArchives" type="Bool">
-            <label context="@label">Browse through archives</label>
+            <label>Browse through archives</label>
             <default>false</default>
         </entry>
         <entry name="ConfirmClosingMultipleTabs" type="Bool">
-            <label context="@label">Ask for confirmation when closing windows with multiple tabs.</label>
+            <label>Ask for confirmation when closing windows with multiple tabs.</label>
             <default>true</default>
         </entry>
         <entry name="RenameInline" type="Bool">
-            <label context="@label">Rename inline</label>
+            <label>Rename inline</label>
             <default>false</default>
         </entry>
         <entry name="ShowSelectionToggle" type="Bool">
-            <label context="@label">Show selection toggle</label>
+            <label>Show selection toggle</label>
             <default>true</default>
         </entry>
         <entry name="ShowToolTips" type="Bool">
-            <label context="@label">Show tooltips</label>
+            <label>Show tooltips</label>
             <default>false</default>
         </entry>
         <entry name="ShowCopyMoveMenu" type="Bool">
-            <label context="@label">Show 'Copy To' and 'Move To' commands in context menu</label>
+            <label>Show 'Copy To' and 'Move To' commands in context menu</label>
             <default>false</default>
         </entry>
         <entry name="ViewPropsTimestamp" type="DateTime" >
-            <label context="@label">Timestamp since when the view properties are valid</label>
+            <label>Timestamp since when the view properties are valid</label>
         </entry>
         <entry name="AutoExpandFolders" type="Bool">
-            <label context="@label">Use auto-expanding folders for all view types</label>
+            <label>Use auto-expanding folders for all view types</label>
             <default>false</default>
         </entry>
         <entry name="ShowZoomSlider" type="Bool">
-            <label context="@label">Show zoom slider in the statusbar</label>
+            <label>Show zoom slider in the statusbar</label>
             <default>true</default>
         </entry>
         <entry name="ShowSpaceInfo" type="Bool">
-            <label context="@label">Show the space information in the statusbar</label>
+            <label>Show the space information in the statusbar</label>
             <default>false</default>
         </entry>
     </group>

diff --git a/src/settings/dolphin_iconsmodesettings.kcfg b/src/settings/dolphin_iconsmodesettings.kcfg
index 1311f6d20eda79705da7a8b9d40a9c49acc743ed..8bd1ef325732712c6c7fd3acc8df54c860aebc3e 100644 (file)
--- a/src/settings/dolphin_iconsmodesettings.kcfg
+++ b/src/settings/dolphin_iconsmodesettings.kcfg
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <kcfg>
-    <kcfgfile name="dolphinrc"/>
     <include>kglobalsettings.h</include>
     <include>kiconloader.h</include>
     <include>QListView</include>
+    <kcfgfile name="dolphinrc"/>
     <group name="IconsMode">
         <entry name="Arrangement" type="Int">
-            <label context="@label">Arrangement</label>
+            <label>Arrangement</label>
             <default code="true">QListView::TopToBottom</default>
         </entry>
         <entry name="UseSystemFont" type="Bool">
-            <label context="@label">Use system font</label>
+            <label>Use system font</label>
             <default>true</default>
         </entry>
         <entry name="FontFamily" type="String">
-            <label context="@label">Font family</label>
+            <label>Font family</label>
             <default code="true">KGlobalSettings::generalFont().family()</default>
         </entry>
         <entry name="FontSize" type="Int">
-            <label context="@label">Font size</label>
+            <label>Font size</label>
             <default code="true">KGlobalSettings::generalFont().pointSize()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
-            <label context="@label Font style">Italic</label>
+            <label>Italic</label>
             <default>false</default>
         </entry>
         <entry name="FontWeight" type="Int">
-            <label context="@label">Font weight</label>
+            <label>Font weight</label>
             <default>0</default>
         </entry>
         <entry name="ItemHeight" type="Int">
-            <label context="@label">Item height</label>
+            <label>Item height</label>
             <!--
                  check 'void IconsViewSettingsPage::applySettings()' as reference (iconsviewsettingspage.cpp):
                  itemHeight += fontHeight * numberOfTextlines + 10;
@@ -39,7 +39,7 @@
             <default code="true">KIconLoader::SizeMedium + QFontMetrics(KGlobalSettings::generalFont()).height() * 2 + 10</default>
         </entry>
         <entry name="ItemWidth" type="Int">
-            <label context="@label">Item width</label>
+            <label>Item width</label>
             <!--
                  check 'void IconsViewSettingsPage::applySettings()' as reference (iconsviewsettingspage.cpp):
                  itemWidth = TopToBottomBase + textSizeIndex * TopToBottomInc;
@@ -47,20 +47,20 @@
             <default>96</default>
         </entry>
         <entry name="GridSpacing" type="Int">
-            <label context="@label">Grid spacing</label>
+            <label>Grid spacing</label>
             <default>8</default>
         </entry>
         <entry name="IconSize" type="Int">
-            <label context="@label">Icon size</label>
+            <label>Icon size</label>
             <default code="true">KIconLoader::SizeMedium</default>
         </entry>
         <entry name="NumberOfTextlines" type="Int">
-            <label context="@label">Number of textlines</label>
+            <label>Number of textlines</label>
             <!-- don't forget adjusting the "ItemHeight" too when changing this value /-->
             <default>2</default>
         </entry>
         <entry name="PreviewSize" type="Int">
-            <label context="@label">Preview size</label>
+            <label>Preview size</label>
             <default code="true">KIconLoader::SizeHuge</default>
         </entry>
     </group>