Index: trunk/extragear/multimedia/amarok/src/engine/xine/xineconfigbase.ui
===================================================================
--- trunk/extragear/multimedia/amarok/src/engine/xine/xineconfigbase.ui	(revision 439120)
+++ trunk/extragear/multimedia/amarok/src/engine/xine/xineconfigbase.ui	(revision 439121)
@@ -1,316 +1,316 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>XineConfigBase</class>
 <widget class="QDialog">
     <property name="name">
         <cstring>XineConfigBase</cstring>
     </property>
     <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
             <width>358</width>
-            <height>410</height>
+            <height>520</height>
         </rect>
     </property>
     <property name="sizePolicy">
         <sizepolicy>
             <hsizetype>5</hsizetype>
             <vsizetype>5</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
     <property name="caption">
         <string>Xine Configure</string>
     </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <widget class="QLabel">
             <property name="name">
                 <cstring>xineLogo</cstring>
             </property>
             <property name="paletteForegroundColor">
                 <color>
                     <red>0</red>
                     <green>0</green>
                     <blue>0</blue>
                 </color>
             </property>
             <property name="paletteBackgroundColor">
                 <color>
                     <red>255</red>
                     <green>255</green>
                     <blue>255</blue>
                 </color>
             </property>
             <property name="frameShape">
                 <enum>StyledPanel</enum>
             </property>
             <property name="frameShadow">
                 <enum>Raised</enum>
             </property>
             <property name="margin">
                 <number>1</number>
             </property>
             <property name="text">
                 <string></string>
             </property>
             <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
                 <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Output plugin:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>deviceComboBox</cstring>
                     </property>
                 </widget>
                 <widget class="KComboBox">
                     <property name="name">
                         <cstring>deviceComboBox</cstring>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <widget class="QLabel">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
                     <hsizetype>1</hsizetype>
                     <vsizetype>1</vsizetype>
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
             <property name="text">
                 <string>You may select which audio device to use when the OSS or ALSA output plugins are selected.</string>
             </property>
             <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>alsaGroupBox</cstring>
             </property>
             <property name="title">
                 <string>ALSA Device Configuration</string>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2_3</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Mono:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>monoLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel3_3</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Stereo:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>stereoLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel4_2</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;4 Channel:</string>
+                        <string>&amp;4 Channels:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>chan4LineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>monoLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>stereoLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLineEdit" row="2" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>chan4LineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLabel" row="3" column="0" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>chan5Label</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;5 Channel:</string>
+                        <string>&amp;6 Channels:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>chan5LineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLineEdit" row="4" column="1">
                     <property name="name">
                         <cstring>chan5LineEdit</cstring>
                     </property>
                 </widget>
             </grid>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>ossGroupBox</cstring>
             </property>
             <property name="title">
                 <string>OSS Device Configuration</string>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Device:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>ossDeviceComboBox</cstring>
                     </property>
                 </widget>
                 <widget class="QComboBox">
                     <property name="name">
                         <cstring>ossDeviceComboBox</cstring>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
             <property name="title">
                 <string>HTTP Proxy</string>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>hostLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2_2</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Host:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>hostLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>userLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel4</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Password:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>passLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel3_2</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Username:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>userLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="QLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>passLineEdit</cstring>
                     </property>
                     <property name="echoMode">
                         <enum>Password</enum>
                     </property>
                 </widget>
                 <widget class="KIntSpinBox" row="0" column="2">
                     <property name="name">
                         <cstring>portIntBox</cstring>
                     </property>
                     <property name="maxValue">
                         <number>65534</number>
                     </property>
                     <property name="minValue">
                         <number>1</number>
                     </property>
                     <property name="value">
                         <number>60000</number>
                     </property>
                 </widget>
             </grid>
         </widget>
         <spacer>
             <property name="name">
                 <cstring>spacer3</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
             <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>1</height>
                 </size>
             </property>
         </spacer>
     </vbox>
 </widget>
 <includes>
     <include location="local" impldecl="in declaration">plugin/pluginconfig.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>