diff --git a/src/Options1.ui b/src/Options1.ui
index 6a8ef0ce84..5fa3f3bf7d 100644
--- a/src/Options1.ui
+++ b/src/Options1.ui
@@ -1,706 +1,700 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Options1</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>General</cstring>
     </property>
     <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
             <width>431</width>
             <height>556</height>
         </rect>
     </property>
     <property name="sizePolicy">
         <sizepolicy>
             <hsizetype>3</hsizetype>
             <vsizetype>3</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
     <property name="caption">
         <string>General</string>
     </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
             <number>0</number>
         </property>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>generalBox</cstring>
             </property>
             <property name="margin">
                 <number>0</number>
             </property>
             <property name="title">
                 <string>General Options</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_ShowSplashscreen</cstring>
                     </property>
                     <property name="text">
                         <string>Sho&amp;w splash-screen on startup</string>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Check to enable the splashscreen during Amarok startup.</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>Check to enable the splashscreen during Amarok startup.</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_ShowTrayIcon</cstring>
                     </property>
                     <property name="text">
                         <string>Show tray &amp;icon</string>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Check to enable the Amarok system tray icon.</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>Check to enable the Amarok system tray icon.</string>
                     </property>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <spacer>
                             <property name="name">
                                 <cstring>spacer3_2</cstring>
                             </property>
                             <property name="orientation">
                                 <enum>Horizontal</enum>
                             </property>
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
                             <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>21</height>
                                 </size>
                             </property>
                         </spacer>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>kcfg_AnimateTrayIcon</cstring>
                             </property>
                             <property name="enabled">
                                 <bool>false</bool>
                             </property>
                             <property name="text">
                                 <string>&amp;Flash tray icon when playing</string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Check to animate the Amarok system tray icon.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Check to animate the Amarok system tray icon.</string>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_ShowPlayerWindow</cstring>
                     </property>
                     <property name="text">
                         <string>Show player window</string>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Check to enable an extra player window.</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>Check to enable an extra player window.</string>
                     </property>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
                             <property name="text">
                                 <string>Default si&amp;ze for cover previews:</string>
                             </property>
                             <property name="buddy" stdset="0">
                                 <cstring>kcfg_CoverPreviewSize</cstring>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Size of the cover image in the context viewer in pixels.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Size of the cover image in the context viewer in pixels.</string>
                             </property>
                         </widget>
                         <widget class="QSpinBox">
                             <property name="name">
                                 <cstring>kcfg_CoverPreviewSize</cstring>
                             </property>
                             <property name="suffix">
                                 <string>px</string>
                             </property>
                             <property name="maxValue">
                                 <number>300</number>
                             </property>
                             <property name="minValue">
                                 <number>50</number>
                             </property>
                             <property name="value">
                                 <number>100</number>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Size of the cover images in the context viewer in pixels.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Size of the cover images in the context viewer in pixels.</string>
                             </property>
                         </widget>
                         <spacer>
                             <property name="name">
                                 <cstring>spacer7</cstring>
                             </property>
                             <property name="orientation">
                                 <enum>Horizontal</enum>
                             </property>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
                             <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
                     </hbox>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLabel">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
                             <property name="minimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
                                 </size>
                             </property>
                             <property name="text">
                                 <string>External web &amp;browser:</string>
                             </property>
                             <property name="buddy" stdset="0">
                                 <cstring>kComboBox_browser</cstring>
                             </property>
                         </widget>
                         <widget class="KComboBox">
                             <property name="name">
                                 <cstring>kComboBox_browser</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>7</hsizetype>
                                     <vsizetype>0</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="minimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
                                 </size>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Choose the external web browser to be used by Amarok.</string>
                             </property>
                         </widget>
                         <spacer>
                             <property name="name">
                                 <cstring>spacer7_2</cstring>
                             </property>
                             <property name="orientation">
                                 <enum>Horizontal</enum>
                             </property>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
                             <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>21</height>
                                 </size>
                             </property>
                         </spacer>
                     </hbox>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>checkBox_customBrowser</cstring>
                             </property>
                             <property name="enabled">
                                 <bool>true</bool>
                             </property>
                             <property name="minimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
                                 </size>
                             </property>
                             <property name="text">
                                 <string>Use &amp;another browser:</string>
                             </property>
                         </widget>
                         <widget class="KLineEdit">
                             <property name="name">
                                 <cstring>kLineEdit_customBrowser</cstring>
                             </property>
                             <property name="enabled">
                                 <bool>false</bool>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>7</hsizetype>
                                     <vsizetype>0</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="minimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
                                 </size>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Enter filename of external web browser.</string>
                             </property>
                         </widget>
                         <spacer>
                             <property name="name">
                                 <cstring>spacer7_2_3</cstring>
                             </property>
                             <property name="orientation">
                                 <enum>Horizontal</enum>
                             </property>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
                             <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>21</height>
                                 </size>
                             </property>
                         </spacer>
                     </hbox>
                 </widget>
             </vbox>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>componentsBox</cstring>
             </property>
             <property name="margin">
                 <number>0</number>
             </property>
             <property name="title">
                 <string>Components</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_UseScores</cstring>
                     </property>
                     <property name="text">
                         <string>Use &amp;scores</string>
                     </property>
                     <property name="checked">
                         <bool>false</bool>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Scores for tracks are calculated automatically, based on your listening habits.</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_UseRatings</cstring>
                     </property>
                     <property name="text">
                         <string>Use ratings</string>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>You can assign ratings to tracks manually, from 1 to 5 stars.</string>
                     </property>
                 </widget>
                 <widget class="Line">
                     <property name="name">
                         <cstring>line1</cstring>
                     </property>
                     <property name="frameShape">
                         <enum>HLine</enum>
                     </property>
                     <property name="frameShadow">
                         <enum>Sunken</enum>
                     </property>
                     <property name="orientation">
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
                 <widget class="KActiveLabel">
                     <property name="name">
                         <cstring>moodbarHelpLabel</cstring>
                     </property>
                     <property name="text">
                         <string>You need the &lt;a href='http://amarok.kde.org/wiki/Moodbar'&gt;moodbar package&lt;/a&gt; installed to enable the moodbar feature.</string>
                     </property>
                 </widget>
                 <widget class="QFrame">
                     <property name="name">
                         <cstring>moodFrame</cstring>
                     </property>
                     <property name="frameShape">
                         <enum>NoFrame</enum>
                     </property>
                     <property name="frameShadow">
                         <enum>Raised</enum>
                     </property>
                     <property name="lineWidth">
                         <number>0</number>
                     </property>
                     <property name="margin">
                         <number>0</number>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <property name="margin">
                             <number>0</number>
                         </property>
                         <property name="spacing">
                             <number>0</number>
                         </property>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>kcfg_ShowMoodbar</cstring>
                             </property>
                             <property name="enabled">
                                 <bool>true</bool>
                             </property>
                             <property name="text">
                                 <string>Use &amp;moods</string>
                             </property>
                             <property name="checked">
                                 <bool>true</bool>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Displays a visual representation of the current track in the slider bar of the player window and a column in the playlist window.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Displays a visual representation of the current track in the slider bar of the player window and a column in the playlist window.</string>
                             </property>
                         </widget>
                         <widget class="QLayoutWidget">
                             <property name="name">
                                 <cstring>layout8_2_2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
                                 <spacer>
                                     <property name="name">
                                         <cstring>spacerMoodier</cstring>
                                     </property>
                                     <property name="orientation">
                                         <enum>Horizontal</enum>
                                     </property>
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
                                     <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>21</height>
                                         </size>
                                     </property>
                                 </spacer>
                                 <widget class="QCheckBox">
                                     <property name="name">
                                         <cstring>kcfg_MakeMoodier</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>true</bool>
                                     </property>
                                     <property name="text">
                                         <string>Make m&amp;oodier:</string>
                                     </property>
                                     <property name="toolTip" stdset="0">
                                         <string>When enabled, the hue distribution is quantised and respread evenly, giving a prettier but less meaningful output.</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
                                         <string>When enabled, the hue distribution is quantised and respread evenly, giving a prettier but less meaningful output.</string>
                                     </property>
                                 </widget>
                                 <widget class="QComboBox">
                                     <item>
                                         <property name="text">
                                             <string>Happy Like a Rainbow</string>
                                         </property>
                                     </item>
                                     <item>
                                         <property name="text">
                                             <string>Angry as Hell</string>
                                         </property>
                                     </item>
                                     <item>
                                         <property name="text">
                                             <string>Frozen in the Arctic</string>
                                         </property>
                                     </item>
                                     <property name="name">
                                         <cstring>kcfg_AlterMood</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>false</bool>
                                     </property>
                                 </widget>
                                 <spacer>
                                     <property name="name">
                                         <cstring>spacer7_2_2_2</cstring>
                                     </property>
                                     <property name="orientation">
                                         <enum>Horizontal</enum>
                                     </property>
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
                                     <property name="sizeHint">
                                         <size>
                                             <width>130</width>
                                             <height>20</height>
                                         </size>
                                     </property>
                                 </spacer>
                             </hbox>
                         </widget>
                         <widget class="QLayoutWidget">
                             <property name="name">
                                 <cstring>layout7_2_2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
                                 <spacer>
                                     <property name="name">
                                         <cstring>spacerWithMusic</cstring>
                                     </property>
                                     <property name="orientation">
                                         <enum>Horizontal</enum>
                                     </property>
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
                                     <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>21</height>
                                         </size>
                                     </property>
                                 </spacer>
                                 <widget class="QCheckBox">
                                     <property name="name">
                                         <cstring>kcfg_MoodsWithMusic</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>true</bool>
                                     </property>
                                     <property name="text">
                                         <string>Stor&amp;e mood data files with music</string>
                                     </property>
                                     <property name="toolTip" stdset="0">
                                         <string>Enabling this option stores Mood data files with the music files. Disabling stores them in your home folder.</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
                                         <string>Enabling this option stores Mood data files with the music files. Namely, the mood file for /music/file.mp3 will be /music/file.mood.  Disabling stores them in your home folder.</string>
                                     </property>
                                 </widget>
                             </hbox>
                         </widget>
                     </vbox>
                 </widget>
             </vbox>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
             <property name="margin">
                 <number>0</number>
             </property>
             <property name="title">
                 <string>Playlist-Window Options</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_SavePlaylist</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Remember current playlist on exit</string>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>If checked, Amarok saves the current playlist on quit and restores it when restarted.&lt;br&gt;</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>If checked, Amarok saves the current playlist on quit and restores it when restarted.</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_RelativePlaylist</cstring>
                     </property>
                     <property name="text">
                         <string>Manually sa&amp;ved playlists use relative path</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+V</string>
-                    </property>
                     <property name="toolTip" stdset="0">
                         <string>If checked, Amarok uses a relative path for the tracks of manually saved playlists</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>If checked, Amarok uses a relative path for the tracks of manually saved playlists</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_AutoShowContextBrowser</cstring>
                     </property>
                     <property name="text">
                         <string>Switch to Context &amp;Browser on track change</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+B</string>
-                    </property>
                     <property name="toolTip" stdset="0">
                         <string>Switch to the context browser, when playing a track.&lt;br&gt;</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>Switch to the context browser, when playing a track.</string>
                     </property>
                 </widget>
             </vbox>
         </widget>
         <spacer>
             <property name="name">
                 <cstring>spacer5</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
             <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
     </vbox>
 </widget>
 <connections>
     <connection>
         <sender>kcfg_ShowTrayIcon</sender>
         <signal>toggled(bool)</signal>
         <receiver>kcfg_AnimateTrayIcon</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>checkBox_customBrowser</sender>
         <signal>toggled(bool)</signal>
         <receiver>kComboBox_browser</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
     <connection>
         <sender>checkBox_customBrowser</sender>
         <signal>toggled(bool)</signal>
         <receiver>kLineEdit_customBrowser</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>kcfg_ShowMoodbar</sender>
         <signal>toggled(bool)</signal>
         <receiver>General</receiver>
         <slot>slotUpdateMoodFrame()</slot>
     </connection>
     <connection>
         <sender>kcfg_MakeMoodier</sender>
         <signal>toggled(bool)</signal>
         <receiver>General</receiver>
         <slot>slotUpdateMoodFrame()</slot>
     </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">Options1.ui.h</include>
 </includes>
 <slots>
     <slot>slotUpdateMoodFrame()</slot>
 </slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kactivelabel.h</includehint>
 </includehints>
 </UI>
diff --git a/src/Options2.ui b/src/Options2.ui
index c96c83e5cd..71f2a31e85 100644
--- a/src/Options2.ui
+++ b/src/Options2.ui
@@ -1,771 +1,768 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Options2</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>Options2</cstring>
     </property>
     <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
             <width>447</width>
             <height>564</height>
         </rect>
     </property>
     <property name="sizePolicy">
         <sizepolicy>
             <hsizetype>3</hsizetype>
             <vsizetype>3</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="caption">
-        <string>Options2</string>
-    </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
             <number>0</number>
         </property>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>groupBox6</cstring>
             </property>
             <property name="title">
                 <string>Icons</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_UseCustomIconTheme</cstring>
                     </property>
                     <property name="text">
                         <string>Use custom icon &amp;theme (requires restart)</string>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Check to enable Amarok's custom icon theme.&lt;br&gt;</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>Check to enable Amarok's custom icon theme.</string>
                     </property>
                 </widget>
             </vbox>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>groupBox4</cstring>
             </property>
             <property name="title">
                 <string>Fonts</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_UseCustomFonts</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Use custom fonts</string>
                     </property>
                     <property name="checked">
                         <bool>false</bool>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Check to enable custom fonts.</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>Check to enable custom fonts.</string>
                     </property>
                 </widget>
                 <widget class="QGroupBox">
                     <property name="name">
                         <cstring>fontGroupBox</cstring>
                     </property>
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
                             <hsizetype>7</hsizetype>
                             <vsizetype>5</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
                     <property name="frameShape">
                         <enum>NoFrame</enum>
                     </property>
                     <property name="lineWidth">
                         <number>0</number>
                     </property>
                     <property name="title">
                         <string></string>
                     </property>
                     <property name="flat">
                         <bool>true</bool>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>1</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="text">
                                 <string>Playlist Window:</string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>The font to use in the playlist window.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>The font to use in the playlist window.</string>
                             </property>
                         </widget>
                         <widget class="KFontRequester" row="0" column="1">
                             <property name="name">
                                 <cstring>kcfg_PlaylistWindowFont</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>5</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="sampleText">
                                 <string></string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>The font to use in the playlist window.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>The font to use in the playlist window.</string>
                             </property>
                         </widget>
                         <widget class="QLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>1</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="text">
                                 <string>Player Window:</string>
                             </property>
                             <property name="alignment">
                                 <set>AlignVCenter</set>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>The font to use in the player window.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>The font to use in the player window.</string>
                             </property>
                         </widget>
                         <widget class="QLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>textLabel3_2</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>1</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="text">
                                 <string>Context Sidebar:</string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>The font to use in the context browser.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>The font to use in the context browser.</string>
                             </property>
                         </widget>
                         <widget class="KFontRequester" row="2" column="1">
                             <property name="name">
                                 <cstring>kcfg_ContextBrowserFont</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>5</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="sampleText">
                                 <string></string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>The font to use in the context browser.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>The font to use in the context browser.</string>
                             </property>
                         </widget>
                         <widget class="KFontRequester" row="1" column="1">
                             <property name="name">
                                 <cstring>kcfg_PlayerWidgetFont</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>5</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="sampleText">
                                 <string></string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>The font to use in the context browser.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>The font to use in the context browser.</string>
                             </property>
                         </widget>
                     </grid>
                 </widget>
             </vbox>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
             <property name="title">
                 <string>Color Scheme</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QButtonGroup">
                     <property name="name">
                         <cstring>radioGroup</cstring>
                     </property>
                     <property name="frameShape">
                         <enum>NoFrame</enum>
                     </property>
                     <property name="title">
                         <string></string>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <property name="margin">
                             <number>0</number>
                         </property>
                         <widget class="QLayoutWidget" row="2" column="0">
                             <property name="name">
                                 <cstring>layout2</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
                                 <property name="spacing">
                                     <number>0</number>
                                 </property>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>kcfg_SchemeCustom</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Custom color scheme</string>
                                     </property>
                                     <property name="checked">
                                         <bool>true</bool>
                                     </property>
                                     <property name="toolTip" stdset="0">
                                         <string>If selected, Amarok uses the user-defined colors in the playlist.</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
                                         <string>If selected, Amarok uses the user-defined colors in the playlist.</string>
                                     </property>
                                 </widget>
                                 <widget class="QGroupBox">
                                     <property name="name">
                                         <cstring>customSchemeBox</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>true</bool>
                                     </property>
                                     <property name="focusPolicy">
                                         <enum>NoFocus</enum>
                                     </property>
                                     <property name="frameShape">
                                         <enum>NoFrame</enum>
                                     </property>
                                     <property name="title">
                                         <string></string>
                                     </property>
                                     <property name="flat">
                                         <bool>false</bool>
                                     </property>
                                     <property name="checked">
                                         <bool>false</bool>
                                     </property>
                                     <grid>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
                                         <widget class="QLabel" row="0" column="0">
                                             <property name="name">
                                                 <cstring>fgLabel</cstring>
                                             </property>
                                             <property name="enabled">
                                                 <bool>true</bool>
                                             </property>
                                             <property name="sizePolicy">
                                                 <sizepolicy>
                                                     <hsizetype>4</hsizetype>
                                                     <vsizetype>5</vsizetype>
                                                     <horstretch>0</horstretch>
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
                                             <property name="minimumSize">
                                                 <size>
                                                     <width>0</width>
                                                     <height>0</height>
                                                 </size>
                                             </property>
                                             <property name="text">
                                                 <string>Fo&amp;reground:</string>
                                             </property>
                                             <property name="textFormat">
                                                 <enum>AutoText</enum>
                                             </property>
                                             <property name="buddy" stdset="0">
                                                 <cstring>kcfg_PlaylistWindowFgColor</cstring>
                                             </property>
                                             <property name="whatsThis" stdset="0">
                                                 <string>Selects the color to use as foreground color in the playlist.</string>
                                             </property>
                                         </widget>
                                         <widget class="KColorButton" row="0" column="1">
                                             <property name="name">
                                                 <cstring>kcfg_PlaylistWindowFgColor</cstring>
                                             </property>
                                             <property name="enabled">
                                                 <bool>true</bool>
                                             </property>
                                             <property name="sizePolicy">
                                                 <sizepolicy>
                                                     <hsizetype>5</hsizetype>
                                                     <vsizetype>0</vsizetype>
                                                     <horstretch>2</horstretch>
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
                                             <property name="text">
                                                 <string></string>
                                             </property>
                                             <property name="color">
                                                 <color>
                                                     <red>255</red>
                                                     <green>255</green>
                                                     <blue>255</blue>
                                                 </color>
                                             </property>
                                             <property name="toolTip" stdset="0">
                                                 <string>Click to select the foreground text color in the playlist window.</string>
                                             </property>
                                             <property name="whatsThis" stdset="0">
                                                 <string>Selects the color to use as foreground (text) color in the playlist.</string>
                                             </property>
                                         </widget>
                                         <widget class="QLabel" row="1" column="0">
                                             <property name="name">
                                                 <cstring>bgColor</cstring>
                                             </property>
                                             <property name="enabled">
                                                 <bool>true</bool>
                                             </property>
                                             <property name="sizePolicy">
                                                 <sizepolicy>
                                                     <hsizetype>4</hsizetype>
                                                     <vsizetype>5</vsizetype>
                                                     <horstretch>0</horstretch>
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
                                             <property name="text">
                                                 <string>&amp;Background:</string>
                                             </property>
                                             <property name="textFormat">
                                                 <enum>AutoText</enum>
                                             </property>
                                             <property name="buddy" stdset="0">
                                                 <cstring>kcfg_PlaylistWindowBgColor</cstring>
                                             </property>
                                             <property name="whatsThis" stdset="0">
                                                 <string>Selects the color to use as background color in the playlist.</string>
                                             </property>
                                         </widget>
                                         <widget class="KColorButton" row="1" column="1">
                                             <property name="name">
                                                 <cstring>kcfg_PlaylistWindowBgColor</cstring>
                                             </property>
                                             <property name="enabled">
                                                 <bool>true</bool>
                                             </property>
                                             <property name="sizePolicy">
                                                 <sizepolicy>
                                                     <hsizetype>5</hsizetype>
                                                     <vsizetype>0</vsizetype>
                                                     <horstretch>2</horstretch>
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
                                             <property name="minimumSize">
                                                 <size>
                                                     <width>0</width>
                                                     <height>0</height>
                                                 </size>
                                             </property>
                                             <property name="maximumSize">
                                                 <size>
                                                     <width>192</width>
                                                     <height>32767</height>
                                                 </size>
                                             </property>
                                             <property name="text">
                                                 <string></string>
                                             </property>
                                             <property name="color">
                                                 <color>
                                                     <red>32</red>
                                                     <green>32</green>
                                                     <blue>80</blue>
                                                 </color>
                                             </property>
                                             <property name="toolTip" stdset="0">
                                                 <string>Click to select the background color in the playlist window.</string>
                                             </property>
                                             <property name="whatsThis" stdset="0">
                                                 <string>Selects the color to use as background color in the playlist.</string>
                                             </property>
                                         </widget>
                                     </grid>
                                 </widget>
                             </vbox>
                         </widget>
                         <widget class="QRadioButton" row="0" column="0">
                             <property name="name">
                                 <cstring>kcfg_SchemeKDE</cstring>
                             </property>
                             <property name="text">
                                 <string>The current &amp;KDE color-scheme</string>
                             </property>
                             <property name="buttonGroupId">
                                 <number>0</number>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>If selected, Amarok uses the KDE standard colors in the playlist.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>If selected, Amarok uses the KDE standard colors in the playlist.</string>
                             </property>
                         </widget>
                         <widget class="QRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>kcfg_SchemeAmarok</cstring>
                             </property>
                             <property name="text">
                                 <string>The classic &amp;Amarok, "funky-monkey", theme</string>
                             </property>
                             <property name="buttonGroupId">
                                 <number>1</number>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>If selected, Amarok uses the Amarok standard colors in the playlist.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>If selected, Amarok uses the Amarok standard colors in the playlist.</string>
                             </property>
                         </widget>
                     </grid>
                 </widget>
                 <widget class="Line">
                     <property name="name">
                         <cstring>line1</cstring>
                     </property>
                     <property name="frameShape">
                         <enum>HLine</enum>
                     </property>
                     <property name="frameShadow">
                         <enum>Sunken</enum>
                     </property>
                     <property name="orientation">
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLabel">
                             <property name="name">
                                 <cstring>textLabel1_3</cstring>
                             </property>
                             <property name="text">
                                 <string>Color for new playlist items:</string>
                             </property>
                             <property name="buddy" stdset="0">
                                 <cstring>kcfg_NewPlaylistItemsColor</cstring>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>The color that is used when fresh items are being loaded in the playlist.</string>
                             </property>
                         </widget>
                         <widget class="KColorButton">
                             <property name="name">
                                 <cstring>kcfg_NewPlaylistItemsColor</cstring>
                             </property>
                             <property name="text">
                                 <string></string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>The color that is used when fresh items are being loaded in the playlist.</string>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
             </vbox>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>contextGroupBox</cstring>
             </property>
             <property name="title">
                 <string>Context Browser Style</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLabel">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>5</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="text">
                                 <string>Select a style:</string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string></string>
                             </property>
                         </widget>
                         <widget class="KComboBox">
                             <property name="name">
                                 <cstring>styleComboBox</cstring>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Select the style of the Context Browser.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Select the style of the Context Browser.</string>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QPushButton">
                             <property name="name">
                                 <cstring>installPushButton</cstring>
                             </property>
                             <property name="text">
                                 <string>Install New Style...</string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Click to install a new Context Browser style.&lt;br&gt;Tip: More styles can be found on &lt;a href='http://kde-look.org'&gt;http://kde-look.org&lt;/a&gt;</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Select and install a new Context Browser style.</string>
                             </property>
                         </widget>
                         <widget class="QPushButton">
                             <property name="name">
                                 <cstring>retrievePushButton</cstring>
                             </property>
                             <property name="text">
                                 <string>Download Styles...</string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Click to download new Context Browser styles.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Select and download new Context Browser styles.</string>
                             </property>
                         </widget>
                         <spacer>
                             <property name="name">
                                 <cstring>spacer2</cstring>
                             </property>
                             <property name="orientation">
                                 <enum>Horizontal</enum>
                             </property>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
                             <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
                         <widget class="QPushButton">
                             <property name="name">
                                 <cstring>uninstallPushButton</cstring>
                             </property>
                             <property name="text">
                                 <string>Uninstall Style</string>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Click to uninstall the selected Context Browser style.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Uninstall the selected Context Browser style.</string>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
             </vbox>
         </widget>
         <spacer>
             <property name="name">
                 <cstring>spacer1</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
             <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
     </vbox>
 </widget>
 <connections>
     <connection>
         <sender>kcfg_UseCustomFonts</sender>
         <signal>toggled(bool)</signal>
         <receiver>fontGroupBox</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>kcfg_SchemeCustom</sender>
         <signal>toggled(bool)</signal>
         <receiver>customSchemeBox</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>installPushButton</sender>
         <signal>clicked()</signal>
         <receiver>Options2</receiver>
         <slot>installPushButton_clicked()</slot>
     </connection>
     <connection>
         <sender>retrievePushButton</sender>
         <signal>clicked()</signal>
         <receiver>Options2</receiver>
         <slot>retrievePushButton_clicked()</slot>
     </connection>
     <connection>
         <sender>uninstallPushButton</sender>
         <signal>clicked()</signal>
         <receiver>Options2</receiver>
         <slot>uninstallPushButton_clicked()</slot>
     </connection>
     <connection>
         <sender>styleComboBox</sender>
         <signal>activated(const QString&amp;)</signal>
         <receiver>Options2</receiver>
         <slot>styleComboBox_activated(const QString&amp;)</slot>
     </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">Options2.ui.h</include>
 </includes>
 <slots>
     <slot>installPushButton_clicked()</slot>
     <slot>retrievePushButton_clicked()</slot>
     <slot>uninstallPushButton_clicked()</slot>
     <slot>styleComboBox_activated( const QString &amp; s )</slot>
     <slot>updateStyleComboBox()</slot>
 </slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontrequester.h</includehint>
     <includehint>kfontrequester.h</includehint>
     <includehint>kfontrequester.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
 </includehints>
 </UI>
diff --git a/src/Options4.ui b/src/Options4.ui
index dd61bedd87..f55eab8525 100644
--- a/src/Options4.ui
+++ b/src/Options4.ui
@@ -1,625 +1,622 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Options4</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>Options4</cstring>
     </property>
     <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
             <width>455</width>
             <height>447</height>
         </rect>
     </property>
     <property name="sizePolicy">
         <sizepolicy>
             <hsizetype>3</hsizetype>
             <vsizetype>3</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="caption">
-        <string>Options4</string>
-    </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <widget class="QButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>opt_crossfade</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
                     <hsizetype>5</hsizetype>
                     <vsizetype>5</vsizetype>
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
             <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>180</height>
                 </size>
             </property>
             <property name="frameShape">
                 <enum>GroupBoxPanel</enum>
             </property>
             <property name="frameShadow">
                 <enum>Sunken</enum>
             </property>
             <property name="title">
                 <string>&amp;Transition</string>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;b&gt;Transition Behavior&lt;/b&gt;
 &lt;p&gt;During playback, when Amarok transitions between tracks, it can either proceed to the next track instantly (with configurable gap), or crossfade (with configurable fade period).&lt;/p&gt;</string>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>radioButtonNormalPlayback</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;No crossfading</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Enable normal track transition. You may insert a gap of silence between tracks.</string>
                     </property>
                 </widget>
                 <widget class="QLayoutWidget" row="1" column="1">
                     <property name="name">
                         <cstring>layout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLabel">
                             <property name="name">
                                 <cstring>trackDelayLengthLabel</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>4</hsizetype>
                                     <vsizetype>1</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="minimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
                                 </size>
                             </property>
                             <property name="text">
                                 <string>Insert &amp;gap:</string>
                             </property>
                             <property name="buddy" stdset="0">
                                 <cstring>kcfg_TrackDelayLength</cstring>
                             </property>
                         </widget>
                         <widget class="QSpinBox">
                             <property name="name">
                                 <cstring>kcfg_TrackDelayLength</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>3</hsizetype>
                                     <vsizetype>0</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="minimumSize">
                                 <size>
                                     <width>160</width>
                                     <height>0</height>
                                 </size>
                             </property>
                             <property name="suffix">
                                 <string> ms</string>
                             </property>
                             <property name="maxValue">
                                 <number>10000</number>
                             </property>
                             <property name="lineStep">
                                 <number>100</number>
                             </property>
                             <property name="value">
                                 <number>0</number>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Silence between tracks, in milliseconds.</string>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
                 <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_Crossfade</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Crossfading</string>
                     </property>
                     <property name="checked">
                         <bool>false</bool>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Enable crossfading between tracks.</string>
                     </property>
                 </widget>
                 <widget class="QLayoutWidget" row="3" column="1">
                     <property name="name">
                         <cstring>layout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
                                 <cstring>layout7</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
                                 <widget class="QLabel">
                                     <property name="name">
                                         <cstring>crossfadeLengthLabel</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>false</bool>
                                     </property>
                                     <property name="sizePolicy">
                                         <sizepolicy>
                                             <hsizetype>4</hsizetype>
                                             <vsizetype>1</vsizetype>
                                             <horstretch>0</horstretch>
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
                                     <property name="minimumSize">
                                         <size>
                                             <width>150</width>
                                             <height>0</height>
                                         </size>
                                     </property>
                                     <property name="text">
                                         <string>Crosso&amp;ver duration:</string>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>kcfg_CrossfadeLength</cstring>
                                     </property>
                                 </widget>
                                 <widget class="QLabel">
                                     <property name="name">
                                         <cstring>crossfadeDropdownText</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>false</bool>
                                     </property>
                                     <property name="sizePolicy">
                                         <sizepolicy>
                                             <hsizetype>4</hsizetype>
                                             <vsizetype>1</vsizetype>
                                             <horstretch>0</horstretch>
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
                                     <property name="minimumSize">
                                         <size>
                                             <width>150</width>
                                             <height>0</height>
                                         </size>
                                     </property>
                                     <property name="text">
                                         <string>Crossfa&amp;de:</string>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>kcfg_CrossfadeType</cstring>
                                     </property>
                                 </widget>
                             </vbox>
                         </widget>
                         <widget class="QLayoutWidget">
                             <property name="name">
                                 <cstring>layout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
                                 <widget class="QSpinBox">
                                     <property name="name">
                                         <cstring>kcfg_CrossfadeLength</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>false</bool>
                                     </property>
                                     <property name="sizePolicy">
                                         <sizepolicy>
                                             <hsizetype>5</hsizetype>
                                             <vsizetype>4</vsizetype>
                                             <horstretch>0</horstretch>
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
                                     <property name="minimumSize">
                                         <size>
                                             <width>50</width>
                                             <height>0</height>
                                         </size>
                                     </property>
                                     <property name="suffix">
                                         <string> ms</string>
                                     </property>
                                     <property name="maxValue">
                                         <number>99999999</number>
                                     </property>
                                     <property name="minValue">
                                         <number>100</number>
                                     </property>
                                     <property name="lineStep">
                                         <number>100</number>
                                     </property>
                                     <property name="value">
                                         <number>100</number>
                                     </property>
                                     <property name="toolTip" stdset="0">
                                         <string>The length of the crossfade between tracks, in milliseconds.</string>
                                     </property>
                                 </widget>
                                 <widget class="QComboBox">
                                     <item>
                                         <property name="text">
                                             <string>Always</string>
                                         </property>
                                     </item>
                                     <item>
                                         <property name="text">
                                             <string>On Automatic Track Change Only</string>
                                         </property>
                                     </item>
                                     <item>
                                         <property name="text">
                                             <string>On Manual Track Change Only</string>
                                         </property>
                                     </item>
                                     <property name="name">
                                         <cstring>kcfg_CrossfadeType</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>false</bool>
                                     </property>
                                     <property name="sizePolicy">
                                         <sizepolicy>
                                             <hsizetype>5</hsizetype>
                                             <vsizetype>4</vsizetype>
                                             <horstretch>0</horstretch>
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
                                     <property name="minimumSize">
                                         <size>
                                             <width>50</width>
                                             <height>0</height>
                                         </size>
                                     </property>
                                     <property name="duplicatesEnabled">
                                         <bool>false</bool>
                                     </property>
                                     <property name="toolTip" stdset="0">
                                         <string>Select when you want crossfading to occur</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
                                         <string>Select when you want crossfading to occur</string>
                                     </property>
                                 </widget>
                             </vbox>
                         </widget>
                     </hbox>
                 </widget>
                 <spacer row="3" column="0">
                     <property name="name">
                         <cstring>spacer76</cstring>
                     </property>
                     <property name="orientation">
                         <enum>Horizontal</enum>
                     </property>
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
                     <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
             </grid>
         </widget>
         <widget class="QCheckBox" row="2" column="0">
             <property name="name">
                 <cstring>kcfg_FadeoutOnExit</cstring>
             </property>
             <property name="text">
                 <string>Fade out on e&amp;xit</string>
             </property>
             <property name="toolTip" stdset="0">
                 <string>If checked, Amarok will fade out the music on program exit.</string>
             </property>
         </widget>
         <widget class="QCheckBox" row="3" column="0">
             <property name="name">
                 <cstring>kcfg_ResumePlayback</cstring>
             </property>
             <property name="text">
                 <string>&amp;Resume playback on start</string>
             </property>
             <property name="toolTip" stdset="0">
                 <string>If checked, Amarok will&lt;br&gt;resume playback from where you left it the previous session -- just like a tape-player.</string>
             </property>
         </widget>
         <spacer row="4" column="0">
             <property name="name">
                 <cstring>spacer2</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
             <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
         <widget class="QButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>opt_crossfade_2</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
                     <hsizetype>5</hsizetype>
                     <vsizetype>5</vsizetype>
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
             <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>120</height>
                 </size>
             </property>
             <property name="frameShape">
                 <enum>GroupBoxPanel</enum>
             </property>
             <property name="frameShadow">
                 <enum>Sunken</enum>
             </property>
             <property name="title">
                 <string>&amp;Fadeout</string>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;b&gt;Transition Behavior&lt;/b&gt;
 &lt;p&gt;During playback, when Amarok transitions between tracks, it can either proceed to the next track instantly (with configurable gap), or crossfade (with configurable fade period).&lt;/p&gt;</string>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>radioButtonNormalPlayback_2</cstring>
                     </property>
                     <property name="text">
                         <string>No &amp;fadeout</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Disable fadeout. Music will stop immediately.</string>
                     </property>
                 </widget>
                 <spacer row="2" column="0">
                     <property name="name">
                         <cstring>spacer76_2</cstring>
                     </property>
                     <property name="orientation">
                         <enum>Horizontal</enum>
                     </property>
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
                     <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
                 <widget class="QLayoutWidget" row="2" column="1">
                     <property name="name">
                         <cstring>layout9_2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
                                 <cstring>layout7_2</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
                                 <widget class="QLabel">
                                     <property name="name">
                                         <cstring>fadeoutLengthLabel</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>false</bool>
                                     </property>
                                     <property name="sizePolicy">
                                         <sizepolicy>
                                             <hsizetype>4</hsizetype>
                                             <vsizetype>1</vsizetype>
                                             <horstretch>0</horstretch>
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
                                     <property name="minimumSize">
                                         <size>
                                             <width>150</width>
                                             <height>0</height>
                                         </size>
                                     </property>
                                     <property name="text">
                                         <string>Fadeout &amp;duration:</string>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>kcfg_FadeoutLength</cstring>
                                     </property>
                                 </widget>
                             </vbox>
                         </widget>
                         <widget class="QLayoutWidget">
                             <property name="name">
                                 <cstring>layout8_2</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
                                 <widget class="QSpinBox">
                                     <property name="name">
                                         <cstring>kcfg_FadeoutLength</cstring>
                                     </property>
                                     <property name="enabled">
                                         <bool>false</bool>
                                     </property>
                                     <property name="sizePolicy">
                                         <sizepolicy>
                                             <hsizetype>5</hsizetype>
                                             <vsizetype>4</vsizetype>
                                             <horstretch>0</horstretch>
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
                                     <property name="minimumSize">
                                         <size>
                                             <width>50</width>
                                             <height>0</height>
                                         </size>
                                     </property>
                                     <property name="suffix">
                                         <string> ms</string>
                                     </property>
                                     <property name="maxValue">
                                         <number>99999999</number>
                                     </property>
                                     <property name="minValue">
                                         <number>100</number>
                                     </property>
                                     <property name="lineStep">
                                         <number>100</number>
                                     </property>
                                     <property name="value">
                                         <number>100</number>
                                     </property>
                                     <property name="toolTip" stdset="0">
                                         <string>The length of the fadeout, in milliseconds.</string>
                                     </property>
                                 </widget>
                             </vbox>
                         </widget>
                     </hbox>
                 </widget>
                 <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_Fadeout</cstring>
                     </property>
                     <property name="text">
                         <string>Fade&amp;out</string>
                     </property>
                     <property name="checked">
                         <bool>false</bool>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Fade the music out when the Stop button is pressed.</string>
                     </property>
                 </widget>
             </grid>
         </widget>
     </grid>
 </widget>
 <connections>
     <connection>
         <sender>radioButtonNormalPlayback</sender>
         <signal>toggled(bool)</signal>
         <receiver>kcfg_TrackDelayLength</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>kcfg_Crossfade</sender>
         <signal>toggled(bool)</signal>
         <receiver>kcfg_CrossfadeLength</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>radioButtonNormalPlayback</sender>
         <signal>toggled(bool)</signal>
         <receiver>trackDelayLengthLabel</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>kcfg_Crossfade</sender>
         <signal>toggled(bool)</signal>
         <receiver>crossfadeLengthLabel</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>kcfg_Crossfade</sender>
         <signal>toggled(bool)</signal>
         <receiver>crossfadeDropdownText</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>kcfg_Crossfade</sender>
         <signal>toggled(bool)</signal>
         <receiver>kcfg_CrossfadeType</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>kcfg_Fadeout</sender>
         <signal>toggled(bool)</signal>
         <receiver>fadeoutLengthLabel</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>kcfg_Fadeout</sender>
         <signal>toggled(bool)</signal>
         <receiver>kcfg_FadeoutLength</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/src/Options8.ui b/src/Options8.ui
index b02df03e74..6ad0d1de16 100644
--- a/src/Options8.ui
+++ b/src/Options8.ui
@@ -1,314 +1,305 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Options8</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>Options8</cstring>
     </property>
     <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
             <width>425</width>
             <height>418</height>
         </rect>
     </property>
     <property name="minimumSize">
         <size>
             <width>1</width>
             <height>1</height>
         </size>
     </property>
-    <property name="caption">
-        <string>Options8</string>
-    </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
             <number>0</number>
         </property>
         <property name="spacing">
             <number>12</number>
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
                 <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <property name="spacing">
                     <number>12</number>
                 </property>
                 <widget class="QLabel">
                     <property name="name">
                         <cstring>infoPixmap_2</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
                             <hsizetype>4</hsizetype>
                             <vsizetype>1</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
                     <property name="text">
                         <string></string>
                     </property>
                     <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
                 <widget class="KActiveLabel">
                     <property name="name">
                         <cstring>kActiveLabel3</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>4</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
                     <property name="minimumSize">
                         <size>
                             <width>-1</width>
                             <height>-1</height>
                         </size>
                     </property>
                     <property name="text">
                         <string>Amarok can send the name of every song you play to last.fm. The system automatically matches you to people with similar musical tastes, and creates personalized recommendations. To learn more about last.fm, &lt;A href='http://www.last.fm'&gt;visit the homepage&lt;/A&gt;.</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
             <property name="title">
                 <string>last.fm Profile</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="KActiveLabel">
                     <property name="name">
                         <cstring>kActiveLabel1</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
                     <property name="text">
                         <string>&lt;P&gt;To use last.fm with Amarok, you need a &lt;A href='http://www.last.fm:80/signup.php'&gt;last.fm profile&lt;/A&gt;.</string>
                     </property>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="KLineEdit" row="0" column="1">
                             <property name="name">
                                 <cstring>kcfg_ScrobblerUsername</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>7</hsizetype>
                                     <vsizetype>0</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                         </widget>
                         <widget class="QLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>labelPassword</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>5</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="text">
                                 <string>&amp;Password:</string>
                             </property>
                             <property name="buddy" stdset="0">
                                 <cstring>kcfg_ScrobblerPassword</cstring>
                             </property>
                         </widget>
                         <widget class="QLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>labelUsername</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>5</hsizetype>
                                     <vsizetype>5</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="text">
                                 <string>&amp;Username:</string>
                             </property>
                             <property name="buddy" stdset="0">
                                 <cstring>kcfg_ScrobblerUsername</cstring>
                             </property>
                         </widget>
                         <widget class="KLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>kcfg_ScrobblerPassword</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
                                     <hsizetype>7</hsizetype>
                                     <vsizetype>0</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="echoMode">
                                 <enum>Password</enum>
                             </property>
                         </widget>
                     </grid>
                 </widget>
             </vbox>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
             <property name="enabled">
                 <bool>false</bool>
             </property>
             <property name="title">
                 <string>last.fm Services</string>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
                     <property name="text">
                         <string>Once registered, Amarok can tell the last.fm service about your listening habits; your profile can then provide statistics and recommendations. A profile is not required to retrieve similar-artists for display in the Context Browser.</string>
                     </property>
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
                 </widget>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_SubmitPlayedSongs</cstring>
                     </property>
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
                             <hsizetype>7</hsizetype>
                             <vsizetype>5</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
                     <property name="text">
                         <string>Improve m&amp;y profile by submitting the tracks I play</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+Y</string>
-                    </property>
                 </widget>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_RetrieveSimilarArtists</cstring>
                     </property>
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
                     <property name="text">
                         <string>&amp;Retrieve similar artists</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+R</string>
-                    </property>
                 </widget>
             </vbox>
         </widget>
         <widget class="KActiveLabel">
             <property name="name">
                 <cstring>kActiveLabel2</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
                     <hsizetype>5</hsizetype>
                     <vsizetype>5</vsizetype>
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
             <property name="text">
                 <string>Why not join the &lt;A href='http://www.last.fm:80/group/Amarok+Users'&gt;Amarok last.fm group&lt;/A&gt; and share your musical tastes with other Amarok users?</string>
             </property>
         </widget>
         <spacer>
             <property name="name">
                 <cstring>spacer4</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
             <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
     </vbox>
 </widget>
 <connections>
     <connection>
         <sender>kcfg_ScrobblerUsername</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>Options8</receiver>
         <slot>updateServices(const QString&amp;)</slot>
     </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">Options8.ui.h</include>
 </includes>
 <slots>
     <slot access="protected">updateServices( const QString &amp; s )</slot>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kactivelabel.h</includehint>
 </includehints>
 </UI>
diff --git a/src/device/massstorage/amarok_massstorage-device.desktop b/src/device/massstorage/amarok_massstorage-device.desktop
index a3b59b7ab6..ef48dee5b1 100644
--- a/src/device/massstorage/amarok_massstorage-device.desktop
+++ b/src/device/massstorage/amarok_massstorage-device.desktop
@@ -1,110 +1,110 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=Mass Storage Device
 Name[af]=Massa Stoor Toestel
 Name[ar]=جهاز حفظ ذو الذاكرة الضخمة
 Name[bg]=Устройство за съхранение
 Name[bn]=মাস স্টোরেজ ডিভাইস
 Name[ca]=Dispositiu d'emmagatzemament massiu
 Name[cs]=Souborové mediální zařízení
 Name[da]=Masseopbevaringsenhed
 Name[de]=Wechsellaufwerk
 Name[el]=Συσκευή μαζικής αποθήκευσης
 Name[eo]=Amasmemora Ekipaĵo
 Name[es]=Dispositivo de almacenamiento masivo
 Name[et]=Mass-salvestusseade
 Name[fa]=دستگاه ذخیره‌گاه حجم
 Name[fi]=Massamuistilaite
 Name[fr]=Périphérique de stockage
 Name[gl]=Dispositivo de Armacenaxe
 Name[hu]=Tárolóeszköz
 Name[is]=Harðir diskar o.þ.h
 Name[it]=Dispositivo di memorizzazione di massa
 Name[ja]=マスストレージデバイス
 Name[ka]=არქივის შესანახი მოწყობილობა
 Name[km]=ឧបករណ៍​ផ្ទុក​ធំ
 Name[lt]=Duomenų saugojimo įrenginys
 Name[mk]=Уред за складирање податоци
 Name[nb]=Masselagerenhet
 Name[nds]=Bültspieker-Reedschap
 Name[ne]=बृहत भण्डारण यन्त्र
 Name[nl]=Massa-opslag-apparaat
 Name[nn]=Masselagringseining
 Name[pa]=ਵੱਡਾ ਸਟੋਰੇਜ਼ ਜੰਤਰ
 Name[pl]=Urządzenie przechowywania danych
 Name[pt]=Dispositivo Multimédia com Armazenamento
 Name[pt_BR]=Dispositivo de Armazenamento em Massa
 Name[se]=Vurkenovttadat
 Name[sk]=Zariadenie na masové ukladanie
 Name[sr]=Уређај за масовно складиштење
 Name[sr@Latn]=Uređaj za masovno skladištenje
 Name[sv]=Masslagringsenhet
 Name[th]=อุปกรณ์สื่อบันทึกข้อมูล
 Name[tr]=Yığın Depolama Aygıtı
 Name[uk]=Пристрій масового накопичувача
 Name[uz]=Saqlash uskunasi
 Name[uz@cyrillic]=Сақлаш ускунаси
 Name[wa]=Éndjin d' wårdaedje di masse
 Name[zh_CN]=大容量存储设备
 Name[zh_TW]=大型儲存裝置
 Comment=Device plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за устройство за Amarok
 Comment[bn]=আমারক-এর জন্য ডিভাইস প্লাগিন
 Comment[ca]=Connector de dispositiu per a l'Amarok
 Comment[cs]=Modul zařízení pro AmaroK
 Comment[da]=Enheds-plugin for Amarok
 Comment[de]=Geräte-Modul für Amarok
 Comment[el]=Πρόσθετο συσκευής για το AmaroK
 Comment[eo]=Ekipaĵa kromaĵo por Amarok
 Comment[es]=Plugin de dispositivos para Amarok
 Comment[et]=Amaroki seadmeplugin
 Comment[fa]=وصلۀ دستگاه برای Amarok
 Comment[fi]=Amarok-laiteliitännäinen
 Comment[fr]=Plugin de périphérique pour Amarok
 Comment[ga]=Breiseán gléis le haghaidh AmaroK
 Comment[gl]=Extensión de dispositivos para Amarok
 Comment[hu]=Eszköz-bővítőmodul az Amarokhoz
 Comment[is]=Tækja íforrit fyrir Amarok
 Comment[it]=Plugin di dispositivo per Amarok
 Comment[ja]=Amarok のためのデバイスプラグイン
 Comment[ka]=მოწყობილობის ძრავი Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​ឧបករណ៍​សម្រាប់ Amarok
 Comment[lt]=Amarok įrenginio priedas
 Comment[mk]=Приклучок за уред за Амарок
 Comment[ms]=Plugin peranti untuk Amarok
 Comment[nb]=Amarok programtillegg for masselagerenhet
 Comment[nds]=Reedschapmoduul för Amarok
 Comment[ne]=अमारोकका लागि यन्त्र प्लगइन
 Comment[nl]=Apparaatplugin voor Amarok
 Comment[nn]=Einingstillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਜੰਤਰ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka urządzenia dla Amaroka
 Comment[pt]='Plugin' de dispositivo para o Amarok
 Comment[pt_BR]=Plugin de dispositivo para o Amarok
 Comment[se]=Ovttadatlassemoduvla Amarok:ii
 Comment[sk]=Modul zariadenia pre Amarok
 Comment[sr]=Уређајски прикључак за Amarok
 Comment[sr@Latn]=Uređajski priključak za Amarok
 Comment[sv]=Enhetsinsticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมจัดการอุปกรณ์สำหรับ Amarok
 Comment[tr]=Amarok için aygıt eklentisi
 Comment[uk]=Втулок пристроїв для Amarok
 Comment[uz]=Amarok uchun uskuna plagini
 Comment[uz@cyrillic]=Amarok учун ускуна плагини
 Comment[wa]=Tchôke-divins d' éndjin po Amarok
 Comment[zh_CN]=Amarok 的设备插件
 Comment[zh_TW]=amaroK 裝置插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Library=libamarok_massstorage-device
 
 X-KDE-Amarok-authors=Maximilian Kossick
 X-KDE-Amarok-email=maximilian.kossick@googlemail.com
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 X-KDE-Amarok-name=massstorage-device
 X-KDE-Amarok-plugintype=device
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
diff --git a/src/device/nfs/amarok_nfs-device.desktop b/src/device/nfs/amarok_nfs-device.desktop
index d696712b81..d513ea9501 100644
--- a/src/device/nfs/amarok_nfs-device.desktop
+++ b/src/device/nfs/amarok_nfs-device.desktop
@@ -1,107 +1,107 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=NFS Device
 Name[af]=NFS Toestel
 Name[ar]=جهاز  نظام الملفات على الشبكة NFS
 Name[bg]=NFS устройство
 Name[bn]=এন-এফ-এস ডিভাইস
 Name[ca]=Dispositiu NFS
 Name[cs]=NFS zařízení
 Name[da]=NFS-enhed
 Name[de]=NFS-Gerät
 Name[el]=Συσκευή NFS
 Name[eo]=NFS Aranĝaĵo
 Name[es]=Dispositivo NFS
 Name[et]=NFS-seade
 Name[fa]=دستگاه NFS
 Name[fi]=NFS-laite
 Name[fr]=Périphérique NFS
 Name[ga]=Gléas NFS
 Name[gl]=Dispositivo NFS
 Name[hu]=NFS-eszköz
 Name[is]=NFS tæki
 Name[it]=Dispositivo NFS
 Name[ja]=NFS デバイス
 Name[ka]=NFS მოწყობილობა
 Name[km]=ឧបករណ៍ NFS
 Name[lt]=NFS įrenginys
 Name[mk]=NFS-уред
 Name[ms]=Peranti NFS
 Name[nb]=NFS-enhet
 Name[nds]=NFS-Reedschap
 Name[ne]=NFS यन्त्र
 Name[nl]=NFS-apparaat
 Name[nn]=NFS-eining
 Name[pa]=NFS ਜੰਤਰ
 Name[pl]=Urządzenie NFS
 Name[pt]=Dispositivo NFS
 Name[pt_BR]=Dispositivo NFS
 Name[se]=NFS-ovttadat
 Name[sk]=NFS zariadenie
 Name[sr]=NFS уређај
 Name[sr@Latn]=NFS uređaj
 Name[sv]=NFS-enhet
 Name[tr]=NFS Aygıtı
 Name[uk]=Пристрій NFS
 Name[uz]=NFS uskunasi
 Name[uz@cyrillic]=NFS ускунаси
 Name[wa]=Éndjin NFS
 Name[zh_CN]=NFS 设备
 Name[zh_TW]=NFS 裝置
 Comment=Device plugin for Amarok which supports NFS
 Comment[af]=Toestel inprop module vir Amarok wat NFS ondersteuning bied
 Comment[bg]=Приставка за устройство за Amarok, поддържаща NFS
 Comment[bn]=আমারক-এর জন্য ডিভাইস প্লাগিন যা এন-এফ-এস সমর্থন করে
 Comment[ca]=Connector de dispositiu per a l'Amarok que accepta NFS
 Comment[cs]=Modul zařízení pro AmaroK, které podporuje NFS
 Comment[da]=Enhedsplugin for Amarok som understøtter NFS
 Comment[de]=Geräte-Modul für Amarok mit Unterstützung für NFS
 Comment[el]=Πρόσθετο συσκευής για το AmaroK με υποστήριξη NFS
 Comment[eo]=Aranĝaĵa kromaĵo por Amarok kiu subtenas NFS-n
 Comment[es]=Plugin de dispositivo con soporte NFS para Amarok
 Comment[et]=Amaroki seadmeplugin NFS-i toega
 Comment[fa]=وصلۀ دستگاه برای Amarok که از NFS پشتیبانی می‌کند
 Comment[fi]=Amarok-liitännäinen, joka tukee NFS:ää (Network File System)
 Comment[fr]=Plugin de périphérique pour Amarok qui supporte NFS
 Comment[gl]=Extensión de dispositivos que soporten NFS para Amarok
 Comment[hu]=NFS-t támogató eszköz-bővítőmodul az Amarokhoz
 Comment[is]=Tækja íforrit fyrir Amarok með stuðning við NFS
 Comment[it]=Plugin di dispositivo per Amarok con supporto NFS
 Comment[ja]=NFS をサポートする Amarok のためのデバイスプラグイン
 Comment[ka]=მოწყობილობის მოდული Amarok-ისთვის NFS მხარდაჭერით
 Comment[km]=កម្មវិធី​ជំនួយ​ឧបករណ៍ សម្រាប់ Amarok ដែល​គាំទ្រ NFS
 Comment[lt]=Amarok įrenginio priedas, palaikantis NFS
 Comment[mk]=Приклучок за уред за Амарок што поддржува NFS
 Comment[ms]=Plugin peranti untuk Amarok yang menyokong NFS
 Comment[nb]=Amarok programtillegg for enhet som støtter NFS
 Comment[nds]=Reedschapmoduul för Amarok, dat NFS ünnerstütt
 Comment[ne]=अमारोकका लागि यन्त्र प्लगइन जसले NFS समर्थन गर्दछ
 Comment[nl]=Apparaatplugin voor Amarok met ondersteuning voor NFS
 Comment[nn]=Einingstillegg for Amarok som støttar NFS
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਜੰਤਰ ਪਲੱਗਇਨ, ਜੋ ਕਿ NFS ਲਈ ਸਹਾਇਕ ਹੈ
 Comment[pl]=Wtyczka urządzenia dla Amaroka z obsługą NFS
 Comment[pt]=Um 'plugin' de dispositivo para o Amarok que suporta o NFS
 Comment[pt_BR]=Plugin de dispositivo para o Amarok, que suporta NFS
 Comment[se]=Ovttadatlassemoduvla Amarokii mii doarju NFS
 Comment[sk]=Modul zariadenia pre Amarok, ktorý podporuje NFS
 Comment[sr]=Уређајски прикључак за Amarok који подржава NFS
 Comment[sr@Latn]=Uređajski priključak za Amarok koji podržava NFS
 Comment[sv]=Enhetsinsticksprogram för Amarok som stöder NFS
 Comment[th]=โปรแกรมเสริมจัดการอุปกรณ์สำหรับ Amarok ที่รองรับการใช้งาน NFS
 Comment[tr]=Amarok için NFS destekleyen aygıt eklentisi
 Comment[uk]=Втулок пристроїв для Amarok, який підтримує NFS
 Comment[wa]=Tchôke-divins d' éndjin po Amarok ki sopoite NFS
 Comment[zh_CN]=Amarok 支持 NFS 的设备插件
 Comment[zh_TW]=支援 NFS 的 amaroK 裝置插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Library=libamarok_nfs-device
 
 X-KDE-Amarok-authors=Maximilian Kossick
 X-KDE-Amarok-email=maximilian.kossick@googlemail.com
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 X-KDE-Amarok-name=nfs-device
 X-KDE-Amarok-plugintype=device
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
diff --git a/src/device/smb/amarok_smb-device.desktop b/src/device/smb/amarok_smb-device.desktop
index f709e6fc98..57ee45905a 100644
--- a/src/device/smb/amarok_smb-device.desktop
+++ b/src/device/smb/amarok_smb-device.desktop
@@ -1,106 +1,106 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=SMB Device
 Name[af]=SMB Toestel
 Name[ar]=جهاز SMB
 Name[bg]=SMB устройство
 Name[bn]=এস-এম‌-বি ডিভাইস
 Name[ca]=Dispositiu SMB
 Name[cs]=SMB zařízení
 Name[da]=SMB-enhed
 Name[de]=SMB-Gerät
 Name[el]=Συσκευή SMB
 Name[eo]=SMB Aranĝaĵo
 Name[es]=Dispositivo SMB
 Name[et]=SMB-seade
 Name[fa]=دستگاه SMB
 Name[fi]=SMB-laite
 Name[fr]=Périphérique SMB
 Name[ga]=Gléas SMB
 Name[gl]=Dispositivo SMB
 Name[hu]=SMB-eszköz
 Name[is]=SMB tæki
 Name[it]=Dispositivo SMB
 Name[ja]=SMB デバイス
 Name[ka]=SMB მოწყობილობა
 Name[km]=ឧបករណ៍ SMB
 Name[lt]=SMB įrenginys
 Name[mk]=SMB-уред
 Name[ms]=Peranti SMB
 Name[nb]=SMB-enhet
 Name[nds]=SMB-Reedschap
 Name[ne]=SMB यन्त्र
 Name[nl]=SMB-apparaat
 Name[nn]=SMB-eining
 Name[pa]=SMB ਜੰਤਰ
 Name[pl]=Urządzenie SMB
 Name[pt]=Dispositivo SMB
 Name[pt_BR]=Dispositivo SMB
 Name[se]=SMB-ovttadat
 Name[sk]=SMB zariadenie
 Name[sr]=SMB уређај
 Name[sr@Latn]=SMB uređaj
 Name[sv]=SMB-enhet
 Name[tr]=SMB Aygıtı
 Name[uk]=Пристрій SMB
 Name[uz]=SMB uskunasi
 Name[uz@cyrillic]=SMB ускунаси
 Name[wa]=Éndjin SMB
 Name[zh_CN]=SMB 设备
 Name[zh_TW]=MSB 裝置
 Comment=Device plugin for Amarok which supports SMBFS
 Comment[af]=Toestel inprop module vir Amarok wat SMBFS ondersteuning bied
 Comment[bg]=Приставка за устройство за Amarok, поддържаща SMBFS
 Comment[bn]=আমারক-এর জন্য ডিভাইস প্লাগিন যা এসএম‌বিএফএস সমর্থন করে
 Comment[ca]=Connector de dispositiu per a l'Amarok que accepta SMBFS
 Comment[cs]=Modul zařízení pro AmaroK, které podporuje SMBFS
 Comment[da]=Enhedsplugin for Amarok som understøtter SMBFS
 Comment[de]=Geräte-Modul für Amarok mit Unterstützung für SMB-Dateisystem
 Comment[el]=Πρόσθετο συσκευής για το AmaroK με υποστήριξη SMBFS
 Comment[eo]=Aranĝaĵa kromaĵo por Amarok kiu subtenas SMBFS-n
 Comment[es]=Plugin de dispositivo con soporte SMBFS para Amarok
 Comment[et]=Amaroki seadmeplugin SMBFS-i toega
 Comment[fa]=وصلۀ دستگاه برای Amarok که از SMBFS پشتیبانی می‌کند
 Comment[fi]=Amarok-liitännäinen, joka tukee SMBFS:ää
 Comment[fr]=Plugin de périphérique pour Amarok qui supporte SMBFS
 Comment[gl]=Extensión de dispositivos que soporten SMBFS para Amarok
 Comment[hu]=SMBFS-t támogató eszköz-bővítőmodul az Amarokhoz
 Comment[is]=Tækja íforrit fyrir Amarok með stuðning við SMBFS
 Comment[it]=Plugin di dispositivo per Amarok con supporto SMBFS
 Comment[ja]=SMBFS をサポートする Amarok のためのデバイスプラグイン
 Comment[km]=កម្មវិធី​ជំនួយ​ឧបករណ៍​សម្រាប់ Amarok ដែល​គាំទ្រ SMBFS
 Comment[lt]=Amarok įrenginio priedas, palaikantis SMBFS
 Comment[mk]=Приклучок за уред за Амарок што поддржува SMBFS
 Comment[ms]=Plugmasuk peranti untuk Amarok yang menyokong SMBFS
 Comment[nb]=Amarok programtillegg for enhet som støtter SMBFS
 Comment[nds]=Reedschapmoduul för Amarok, dat SMBFS ünnerstütt
 Comment[ne]=अमारोकका लागि यन्त्र प्लगइन जसले SMBFS समर्थन गर्दछ
 Comment[nl]=Apparaatplugin voor Amarok met ondersteuning voor SMBFS
 Comment[nn]=Einingstillegg for Amarok som støttar SMBFS
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਜੰਤਰ ਪਲੱਗਇਨ, ਜੋ ਕਿ SMBFS ਲਈ ਸਹਾਇਕ ਹੈ
 Comment[pl]=Wtyczka urządzenia dla Amaroka obsługująca SMBFS
 Comment[pt]=Um 'plugin' de dispositivo para o Amarok que suporta o SMBFS
 Comment[pt_BR]=Plugin de dispositivo para o Amarok, que suporta SMBFS
 Comment[se]=Ovttadatlassemoduvla Amarokii mii doarju SMBFS
 Comment[sk]=Modul zariadenia pre Amarok, ktorý podporuje SMBFS
 Comment[sr]=Уређајски прикључак за Amarok који подржава SMBFS
 Comment[sr@Latn]=Uređajski priključak za Amarok koji podržava SMBFS
 Comment[sv]=Enhetsinsticksprogram för Amarok som stöder SMBFS
 Comment[th]=โปรแกรมเสริมจัดการอุปกรณ์สำหรับ Amarok ที่รองรับการใช้งาน SMBFS
 Comment[tr]=Amarok için SMBFS destekleyen aygıt eklentisi
 Comment[uk]=Втулок пристроїв для Amarok, який підтримує SMBFS
 Comment[wa]=Tchôke-divins d' éndjin po Amarok ki sopoite SMBFS
 Comment[zh_CN]=Amarok 支持 SMBFS 的设备插件
 Comment[zh_TW]=支援 SMBFS 的 amaroK 裝置插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Library=libamarok_smb-device
 
 X-KDE-Amarok-authors=Maximilian Kossick
 X-KDE-Amarok-email=maximilian.kossick@googlemail.com
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 X-KDE-Amarok-name=smb-device
 X-KDE-Amarok-plugintype=device
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
diff --git a/src/engine/akode/amarok_aKode-engine.desktop b/src/engine/akode/amarok_aKode-engine.desktop
index 6f70469799..8c87826f86 100644
--- a/src/engine/akode/amarok_aKode-engine.desktop
+++ b/src/engine/akode/amarok_aKode-engine.desktop
@@ -1,120 +1,120 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=aKode Engine
 Name[af]=aKode Enjin
 Name[ar]=محرك aKode
 Name[bg]=aKode
 Name[bn]=অ্যাকোড ইঞ্জিন
 Name[br]=Keflusker aKode
 Name[ca]=Motor aKode
 Name[cs]=aKode
 Name[da]=aKode-motor
 Name[de]=aKode
 Name[el]=Μηχανή aKode
 Name[eo]=aKode Ilo
 Name[es]=Motor aKode
 Name[et]=aKode mootor
 Name[fa]=موتور aKode
 Name[fi]=aKode
 Name[fr]=Moteur aKode
 Name[ga]=Inneall aKode
 Name[gl]=Motor aKode
 Name[he]=מנוע שמע aKode
 Name[hu]=aKode alrendszer
 Name[is]=aKode vél
 Name[it]=Motore aKode
 Name[ja]=aKode エンジン
 Name[ka]=aKode ძრავა
 Name[km]=ម៉ាស៊ីន aKode
 Name[lt]=aKode variklis
 Name[mk]=aKode-машина
 Name[ms]=Enjin aKode
 Name[nb]=aKode-motor
 Name[nds]=aKode
 Name[ne]=एकोड इन्जिन
 Name[nl]=aKode-engine
 Name[nn]=aKode-motor
 Name[pa]=aKode ਇੰਜਣ
 Name[pl]=Wyjście aKode
 Name[pt]=Motor aKode
 Name[pt_BR]=Mecanismo aKode
 Name[ru]=aKode
 Name[se]=aKode-mohtor
 Name[sl]=Pogon aKode
 Name[sq]=Motor aKode
 Name[sr]=Мотор aKode
 Name[sr@Latn]=Motor aKode
 Name[ss]=Motor aKode
 Name[sv]=aKode-gränssnitt
 Name[ta]=aKode என்ஜின்
 Name[tg]=Муҳаррики aKode
 Name[tr]=aKode Motoru
 Name[uk]=Рушій aKode
 Name[uz]=aKode tizimi
 Name[uz@cyrillic]=aKode тизими
 Name[wa]=Éndjin aKode
 Name[zh_CN]=aKode 引擎
 Name[zh_TW]=aKode 解碼引擎
 ServiceTypes=Amarok/Plugin
 X-KDE-Library=libamarok_aKode-engine
 Comment=aKode audio-engine for Amarok
 Comment[af]=aKode oudio enjin vir Amarok
 Comment[ar]=محرك صوتي aKode ل- AmaroK
 Comment[bg]=Аудио система aKode за Amarok
 Comment[bn]=আমারক-এর জন্য অ্যাকোড অডিও ইঞ্জিন
 Comment[br]=Keflusker klevet aKode evit Amarok
 Comment[ca]=Motor de so aKode per l'Amarok
 Comment[cs]=Zvukový modul aKode pro Amarok
 Comment[da]=aKode lyd-motor for Amarok
 Comment[de]=aKode-Ausgabe-Modul für Amarok
 Comment[el]=Μηχανή ήχου aKode για το AmaroK
 Comment[eo]=aKode aŭdmotoro por Amarok
 Comment[es]=Motor de audio aKode para Amarok
 Comment[et]=Amaroki aKode audiomootor
 Comment[fa]=موتور صوتی aKode برای Amarok
 Comment[fi]=aKode-toistojärjestelmä Amarok-liitännäinen
 Comment[fr]=Moteur audio aKode pour Amarok
 Comment[ga]=Inneall fuaime aKode le haghaidh AmaroK
 Comment[gl]=Motor de áudio aKode para Amarok
 Comment[hu]=aKode hang-alrendszer az Amarokhoz
 Comment[is]=aKode hljóðvél fyrir Amarok
 Comment[it]=motore audio aKode per Amarok
 Comment[ja]=Amarok のための aKode オーディオエンジン
 Comment[ka]=aKode აუდიო ძრავი Amarok-ისთვის
 Comment[km]=ម៉ាស៊ីន​អូឌីយ៉ូ aKode សម្រាប់ Amarok
 Comment[lt]=Amarok skirtas aKode audio variklis
 Comment[mk]=aKode аудио-машина за Амарок
 Comment[ms]=Enjin-audio aKode untuk Amarok
 Comment[nb]=aKode lydmotor for Amarok
 Comment[nds]=aKode-Klangmaschien för Amarok
 Comment[ne]=अमारोकका लागि एकोड अडियो इन्जिन
 Comment[nl]=aKode audio-engine voor Amarok
 Comment[nn]=aKode lydmotor for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ aKode ਆਡੀਓ-ਇੰਜਣ
 Comment[pl]=Wtyczka wyjścia audio aKode dla Amaroka
 Comment[pt]=Motor de áudio do aKode para o Amarok
 Comment[pt_BR]=Mecanismo de áudio aKode para o Amarok
 Comment[ru]=Модуль вывода aKode для amaroK
 Comment[se]=aKode jietnamohtor Amarok:ii
 Comment[sk]=aKode audio-engine pre Amarok
 Comment[sr]=Аудио мотор aKode за Amarok
 Comment[sr@Latn]=Audio motor aKode za Amarok
 Comment[sv]=aKode ljudgränssnitt för Amarok
 Comment[th]=โปรแกรมประมวลผลเสียง aKode สำหรับ Amarok
 Comment[tr]=Amarok için aKode ses-motoru eklentisi
 Comment[uk]=Аудіо-рушій aKode для Amarok
 Comment[uz]=Amarok uchun aKode audio-tizimi
 Comment[uz@cyrillic]=Amarok учун aKode аудио-тизими
 Comment[wa]=Éndjin d' son aKode po-z Amarok
 Comment[zh_CN]=Amarok 的 aKode 音频引擎
 Comment[zh_TW]=AmaroK 的 aKode 解碼引擎
 
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-name=akode-engine
 X-KDE-Amarok-authors=Allan Sandfeld, Max Howell
 X-KDE-Amarok-email=kde@carewolf.com
 X-KDE-Amarok-rank=0
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
diff --git a/src/engine/gst10/amarok_gst10engine_plugin.desktop b/src/engine/gst10/amarok_gst10engine_plugin.desktop
index 24ceed3979..14eeefa000 100644
--- a/src/engine/gst10/amarok_gst10engine_plugin.desktop
+++ b/src/engine/gst10/amarok_gst10engine_plugin.desktop
@@ -1,111 +1,111 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=GStreamer 0.10 Engine
 Name[af]=GStreamer 0.10 Enjin
 Name[ar]=محرك GStreamer 0.10
 Name[bg]=GStreamer 0.10
 Name[bn]=জিস্ট্রীমার ০.১০ ইঞ্জিন
 Name[br]=Keflusker GStreamer 0.10
 Name[ca]=Motor GStreamer 0.10
 Name[cs]=GStreamer 0.10
 Name[da]=GStreamer-0.10-motor
 Name[de]=GStreamer-Treiber 0.10
 Name[el]=Μηχανή GStreamer 0.10
 Name[eo]=GStreamer 0.10 Ilo
 Name[es]=Motor GStreamer 0.10
 Name[et]=GStreamer 0.10 mootor
 Name[fa]=موتور ۰.۱۰ GStreamer
 Name[fi]=GStreamer 0.10
 Name[fr]=Moteur GStreamer 0.10
 Name[ga]=Inneall GStreamer 0.10
 Name[gl]=Motor GStreamer 0.10
 Name[hu]=GStreamer 0.10 alrendszer
 Name[is]=GStreamer 0.10 vél
 Name[it]=Motore GStreamer 0.10
 Name[ja]=GStreamer 0.10 エンジン
 Name[ka]=GStreamer 0.10 ძრავა
 Name[km]=ម៉ាស៊ីន GStreamer 0.10
 Name[lt]=GStreamer 0.10 garso sistema
 Name[mk]=GStreamer 0.10-машина
 Name[ms]=Enjin GStreamer 0.10
 Name[nb]=GStreamer-motor 0.10
 Name[nds]=GStreamer 0.10
 Name[ne]=जीस्ट्रिमर ०.१० इन्जिन
 Name[nn]=GStreamer 0.10-motor
 Name[pa]=ਜੀਸਟਰੀਮਰ 0.10 ਇੰਜਣ
 Name[pl]=Wyjście GStreamer 0.10
 Name[pt]=Motor GStreamer 0.10
 Name[pt_BR]=Mecanismo GStreamer 0.10
 Name[ru]=GStreamer 0.10
 Name[se]=GStreamer 0.10-mohtor
 Name[sr]=Мотор GStreamer 0.10
 Name[sr@Latn]=Motor GStreamer 0.10
 Name[sv]=Gstreamer 0.10-gränssnitt
 Name[tr]=GStreamer 0.10 Motoru
 Name[uk]=Рушій GStreamer 0.10
 Name[uz]=GStreamer 0.10 tizimi
 Name[uz@cyrillic]=GStreamer 0.10 тизими
 Name[wa]=Éndjin GStreamer 0.10
 Name[zh_CN]=GStreamer 0.10 引擎
 Name[zh_TW]=GStreamer 0.10 解碼引擎
 X-KDE-Library=libamarok_gst10engine_plugin
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-name=gst10-engine
 X-KDE-Amarok-authors=Mark Kretschmann,Jakub Stachowski,Paul Cifarelli
 X-KDE-Amarok-email=markey@web.de,qbast@go2.pl,paul@cifarelli.net
 X-KDE-Amarok-rank=0
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
diff --git a/src/engine/helix/amarok_helixengine_plugin.desktop b/src/engine/helix/amarok_helixengine_plugin.desktop
index 47fb3590c5..705749b081 100644
--- a/src/engine/helix/amarok_helixengine_plugin.desktop
+++ b/src/engine/helix/amarok_helixengine_plugin.desktop
@@ -1,118 +1,118 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=Helix Engine
 Name[af]=Helix Enjin
 Name[ar]=محرك Helix 
 Name[bg]=Helix
 Name[bn]=হেলিক্স ইঞ্জিন
 Name[br]=Keflusker Helix
 Name[ca]=Motor Helix
 Name[da]=Helix motor
 Name[de]=Helix
 Name[el]=Μηχανή Helix
 Name[eo]=Helix Ilo
 Name[es]=Motor Helix
 Name[et]=Helixi mootor
 Name[eu]=Helix motorea
 Name[fa]=موتور Helix
 Name[fi]=Helix
 Name[fr]=Moteur Helix
 Name[ga]=Inneall Helix
 Name[gl]=Motor Helix
 Name[he]=מנוע שמע Helix
 Name[hu]=Helix alrendszer
 Name[is]=Helix vél
 Name[it]=Motore Helix
 Name[ja]=Helix エンジン
 Name[ka]=Helix dრავა
 Name[km]=ម៉ាស៊ីន Helix
 Name[lt]=Helix variklis
 Name[mk]=Helix-машина
 Name[ms]=Enjin Helix
 Name[nb]=Helix-motor
 Name[nds]=Helix
 Name[ne]=हेलिक्स इन्जिन
 Name[nl]=Helix-engine
 Name[nn]=Helix-motor
 Name[pa]=ਹੀਲਿਕਸ ਇੰਜਣ
 Name[pl]=Wyjście Helix
 Name[pt]=Motor Helix
 Name[pt_BR]=Mecanismo Helix
 Name[ru]=Helix
 Name[se]=Helix-mohtor
 Name[sq]=Motor Helix
 Name[sr]=Мотор Helix
 Name[sr@Latn]=Motor Helix
 Name[ss]=Motor Helix
 Name[sv]=Helix-gränssnitt
 Name[tg]=Муҳаррики Helix
 Name[tr]=Helix Motoru
 Name[uk]=Рушій Helix
 Name[uz]=Helix tizimi
 Name[uz@cyrillic]=Helix тизими
 Name[wa]=Éndjin Helix
 Name[zh_CN]=Helix 引擎
 Name[zh_TW]=Helix 解碼引擎
 X-KDE-Library=libamarok_helixengine_plugin
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-name=helix-engine
 X-KDE-Amarok-authors=Paul Cifarelli
 X-KDE-Amarok-email=paul@cifarelli.net
 X-KDE-Amarok-rank=75
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
 
 
diff --git a/src/engine/kdemm/amarok_kdemmengine_plugin.desktop b/src/engine/kdemm/amarok_kdemmengine_plugin.desktop
index d6633defb2..c28b5b859b 100644
--- a/src/engine/kdemm/amarok_kdemmengine_plugin.desktop
+++ b/src/engine/kdemm/amarok_kdemmengine_plugin.desktop
@@ -1,119 +1,119 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=KDEMM Engine
 Name[af]=KDEMM Enjin
 Name[ar]=محرك KDEMM
 Name[bg]=KDEMM
 Name[bn]=কেডিই-এমএম ইঞ্জিন
 Name[br]=Keflusker KDEMM
 Name[ca]=Motor KDEMM
 Name[cs]=KDEMM systém
 Name[da]=KDEMM-motor
 Name[de]=KDEMM
 Name[el]=Μηχανή KDEMM
 Name[eo]=KDEMM Ilo
 Name[es]=Motor KDEMM
 Name[et]=KDEMM mootor
 Name[eu]=KDEMM motorea
 Name[fa]=موتور KDEMM
 Name[fi]=KDEMM
 Name[fr]=Moteur KDEMM
 Name[ga]=Inneall KDEMM
 Name[gl]=Motor KDEMM
 Name[he]=מנוע שמע KDEMM
 Name[hi]=केडीईएमएम इंजिन
 Name[hu]=KDEMM alrendszer
 Name[is]=KDEMM vél
 Name[it]=Motore KDEMM
 Name[ja]=KDEMM エンジン
 Name[ka]=KDEMM dრავა
 Name[km]=ម៉ាស៊ីន KDEMM
 Name[lt]=KDEMM variklis
 Name[mk]=KDEMM-машина
 Name[ms]=Enjin KDEMM
 Name[nb]=KDEMM-motor
 Name[nds]=KDEMM
 Name[ne]=KDEMM इन्जिन
 Name[nn]=KDEMM-motor
 Name[pa]=KDEMM ਇੰਜਣ
 Name[pl]=Wyjście KDEMM
 Name[pt]=Motor KDEMM
 Name[pt_BR]=Mecanismo KDEMM
 Name[ru]=KDEMM
 Name[se]=KDEMM-mohtor
 Name[sl]=Pogon KDEMM
 Name[sq]=Motor KDEMM
 Name[sr]=Мотор KDEMM
 Name[sr@Latn]=Motor KDEMM
 Name[ss]=Motor KDEMM
 Name[sv]=KDEMM-gränssnitt
 Name[ta]=KDEMM என்ஜின்
 Name[tg]=Муҳаррики KDEMM
 Name[tr]=KDEMM Motoru
 Name[uk]=Рушій KDEMM
 Name[uz]=KDEMM tizimi
 Name[uz@cyrillic]=KDEMM тизими
 Name[wa]=Éndjin KDEMM
 Name[zh_CN]=KDEMM 引擎
 Name[zh_TW]=KDEMM 引擎
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 
 ServiceTypes=Amarok/Plugin
 X-KDE-Library=libamarok_kdemmengine_plugin
 X-KDE-Amarok-name=KDEMM Engine
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-authors=Roland Gigler
 X-KDE-Amarok-email=rolandg@web.de
 X-KDE-Amarok-rank=0
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
diff --git a/src/engine/mas/amarok_masengine_plugin.desktop b/src/engine/mas/amarok_masengine_plugin.desktop
index a9fdc207ba..b2fdcdd9fc 100644
--- a/src/engine/mas/amarok_masengine_plugin.desktop
+++ b/src/engine/mas/amarok_masengine_plugin.desktop
@@ -1,119 +1,119 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=MAS Engine
 Name[af]=MAS Enjin
 Name[ar]=محرك MAS
 Name[bg]=MAS
 Name[bn]=এম-এ-এস ইঞ্জিন
 Name[br]=Keflusker MAS
 Name[ca]=Motor MAS
 Name[cs]=MAS systém
 Name[da]=MAS-motor
 Name[de]=MAS
 Name[el]=Μηχανή MAS
 Name[eo]=MAS Ilo
 Name[es]=Motor MAS
 Name[et]=MAS mootor
 Name[eu]=MAS motorea
 Name[fa]=موتور MAS
 Name[fi]=MAS
 Name[fr]=Moteur MAS
 Name[ga]=Inneall MAS
 Name[gl]=Motor MAS
 Name[he]=מנוע שמע MAS
 Name[hi]=एमएएस इंजिन
 Name[hu]=MAS alrendszer
 Name[is]=MAS vél
 Name[it]=Motore MAS
 Name[ja]=MAS エンジン
 Name[ka]=MAS dრავა
 Name[km]=ម៉ាស៊ីន MAS
 Name[lt]=MAS variklis
 Name[mk]=MAS-машина
 Name[ms]=Enjin MAS
 Name[nb]=MAS-motor
 Name[nds]=MAS
 Name[ne]=मास इन्जिन
 Name[nn]=MAS-motor
 Name[pa]=MAS ਇੰਜਣ
 Name[pl]=Wyjście MAS
 Name[pt]=Motor MAS
 Name[pt_BR]=Mecanismo MAS
 Name[ru]=MAS
 Name[se]=MAS-mohtor
 Name[sl]=Pogon MAS
 Name[sq]=Motor MAS
 Name[sr]=Мотор MAS
 Name[sr@Latn]=Motor MAS
 Name[ss]=Motor MAS
 Name[sv]=MAS-gränssnitt
 Name[ta]=MAS என்ஜின்
 Name[tg]=Муҳаррики MAS
 Name[tr]=MAS Motoru
 Name[uk]=Рушій MAS
 Name[uz]=MAS tizimi
 Name[uz@cyrillic]=MAS тизими
 Name[wa]=Éndjin MAS
 Name[zh_CN]=MAS 引擎
 Name[zh_TW]=MAS 解碼引擎
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 
 ServiceTypes=Amarok/Plugin
 X-KDE-Library=libamarok_masengine_plugin
 X-KDE-Amarok-name=MAS Engine
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-authors=Roland Gigler
 X-KDE-Amarok-email=rolandg@web.de
 X-KDE-Amarok-rank=0
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
diff --git a/src/engine/nmm/amarok_nmmengine_plugin.desktop b/src/engine/nmm/amarok_nmmengine_plugin.desktop
index ae412ba585..c088d3a05f 100644
--- a/src/engine/nmm/amarok_nmmengine_plugin.desktop
+++ b/src/engine/nmm/amarok_nmmengine_plugin.desktop
@@ -1,122 +1,122 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=NMM Engine
 Name[af]=NMM Enjin
 Name[ar]=محرك NMM
 Name[bg]=NMM
 Name[bn]=এনএমএম ইঞ্জিন
 Name[br]=Keflusker NMM
 Name[ca]=Motor NMM
 Name[cs]=NMM
 Name[da]=NMM-motor
 Name[de]=NMM
 Name[el]=Μηχανή NMM
 Name[eo]=NMM Ilo
 Name[es]=Motor NMM
 Name[et]=NMM mootor
 Name[eu]=NMM motorea
 Name[fa]=موتور NMM
 Name[fi]=NMM
 Name[fr]=Moteur NMM
 Name[ga]=Inneall NMM
 Name[gl]=Motor NMM
 Name[he]=מנוע שמע NMM
 Name[hi]=एनएमएम इंजिन
 Name[hu]=NMM alrendszer
 Name[is]=NMM vél
 Name[it]=Motore NMM
 Name[ja]=NMM エンジン
 Name[ka]=NMM dრავა
 Name[km]=ម៉ាស៊ីន NMM
 Name[lt]=NMM variklis
 Name[mk]=NMM-машина
 Name[ms]=Enjin NMM
 Name[nb]=NMM-motor
 Name[nds]=NMM
 Name[ne]=NMM इन्जिन
 Name[nn]=NMM-motor
 Name[pa]=NMM ਇੰਜਣ
 Name[pl]=Wyjście NMM
 Name[pt]=Motor NMM
 Name[pt_BR]=Mecanismo NMM
 Name[ru]=NMM
 Name[se]=NMM-mohtor
 Name[sl]=Pogon NMM
 Name[sq]=Motor NMM
 Name[sr]=Мотор NMM
 Name[sr@Latn]=Motor NMM
 Name[ss]=Motor NMM
 Name[sv]=NMM-gränssnitt
 Name[ta]=NMM பொறி
 Name[tg]=Муҳаррики NMM
 Name[tr]=NMM Motoru
 Name[uk]=Рушій NMM
 Name[uz]=NMM tizimi
 Name[uz@cyrillic]=NMM тизими
 Name[wa]=Éndjin NMM
 Name[zh_CN]=NMM 引擎
 Name[zh_TW]=NMM 解碼引擎
 X-KDE-Library=libamarok_nmmengine_plugin
 Comment=Amarok plugin
 Comment[af]=Amarok inprop module
 Comment[ar]=قابس ( برنامج مضاف الى ) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক প্লাগিন
 Comment[br]=Lugent Amarok
 Comment[ca]=Connector de l'Amarok
 Comment[cs]=Amarok modul
 Comment[da]=Plugin for Amarok
 Comment[de]=Amarok-Modul
 Comment[el]=Πρόσθετο AmaroK
 Comment[eo]=Amarok kromaĵo
 Comment[es]=Extensión de Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصلۀ amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Amarok-bővítőmodul
 Comment[is]=Amarok íforrit
 Comment[it]=Plugin di Amarok
 Comment[ja]=Amarok プラグイン
 Comment[ka]=Amarok მოდული
 Comment[km]=កម្មវិធី​ជំនួយ Amarok
 Comment[lt]=Amarok priedas
 Comment[mk]=Приклучок за Амарок
 Comment[ms]=Plugin Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Amarok-Moduul
 Comment[ne]=अमारोक प्लगइन
 Comment[nl]=Amarok-plugin
 Comment[nn]=Amarok-tillegg
 Comment[pa]=ਅਮਰੋਕ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin do Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Amarok-lassemoduvla
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมของ Amarok
 Comment[tr]=Amarok eklentisi
 Comment[uk]=Втулок Amarok
 Comment[uz]=Amarok plagini
 Comment[uz@cyrillic]=Amarok плагини
 Comment[wa]=Tchôke-divins Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=AmaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-name=nmm-engine
 X-KDE-Amarok-authors=NMM work group http://www.networkmultimedia.org
 X-KDE-Amarok-email=nmm-dev@graphics.cs.uni-sb.de
 X-KDE-Amarok-rank=50
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
 
diff --git a/src/engine/void/amarok_void-engine_plugin.desktop b/src/engine/void/amarok_void-engine_plugin.desktop
index ff46c9655a..c333852898 100644
--- a/src/engine/void/amarok_void-engine_plugin.desktop
+++ b/src/engine/void/amarok_void-engine_plugin.desktop
@@ -1,118 +1,118 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=<no engine>
 Name[af]=<geen enjin>
 Name[ar]= <ليس هناك محرك صوتي >
 Name[bg]=<без система>
 Name[bn]=<কোনও ইঞ্জিন নয়>
 Name[br]=<keflusker ebet>
 Name[ca]=<sense motor>
 Name[cs]=<žádný systém>
 Name[da]=<ingen motor>
 Name[de]=Keine Audio-Ausgabe
 Name[el]=<χωρίς μηχανή>
 Name[eo]=<neniu ilo>
 Name[et]=<mootor puudub>
 Name[eu]=<motorerik ez>
 Name[fa]=<بدون موتور>
 Name[fi]=<ei järjestelmää>
 Name[fr]=<aucun moteur>
 Name[ga]=<gan inneall>
 Name[gl]=<sen motor>
 Name[he]=<ללא מנוע שמע>
 Name[hi]=<कोई इंजिन नहीं>
 Name[hu]=<nincs alrendszer>
 Name[is]=<engin vél>
 Name[it]=<nessun motore>
 Name[ja]=<エンジンなし>
 Name[ka]=<ძრავის გარეშე>
 Name[km]=<គ្មាន​ម៉ាស៊ីន>
 Name[lt]=<nėra>
 Name[mk]=<нема машина>
 Name[mn]=<нема машина>
 Name[ms]=<tiada enjin>
 Name[nb]=<ingen motor>
 Name[nds]=<keen>
 Name[nl]=<geen engine>
 Name[nn]=<ingen motor>
 Name[pl]=<brak wyjścia>
 Name[pt]=<sem motor>
 Name[pt_BR]=<nenhum mecanismo>
 Name[ru]=<нет>
 Name[se]=<ii makkárge mohtor>
 Name[sk]=<žiadny engine>
 Name[sl]=<brez pogona>
 Name[sq]=<nema motora>
 Name[sr]=<нема мотора>
 Name[sr@Latn]=<nema motora>
 Name[ss]=<nema motora>
 Name[sv]=<inget gränssnitt>
 Name[th]=<ไม่มีโปรแกรมประมวลผลเสียง>
 Name[tr]=<motor yok>
 Name[uk]=<немає рушія>
 Name[uz]=<yoʻq>
 Name[uz@cyrillic]=<йўқ>
 Name[zh_CN]=<无引擎>
 Name[zh_TW]=<不使用解碼引擎>
 X-KDE-Library=libamarok_void-engine_plugin
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-name=void-engine
 X-KDE-Amarok-authors=Max Howell,Mark Kretschmann
 X-KDE-Amarok-email=max.howell@methylblue.com
 X-KDE-Amarok-rank=1
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
 
diff --git a/src/engine/xine/amarok_xine-engine.desktop b/src/engine/xine/amarok_xine-engine.desktop
index eafe2b1f6f..ee732da916 100644
--- a/src/engine/xine/amarok_xine-engine.desktop
+++ b/src/engine/xine/amarok_xine-engine.desktop
@@ -1,121 +1,121 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=xine Engine
 Name[af]=XINE enjin
 Name[ar]=محرك xine
 Name[bg]=Xine
 Name[bn]=জাইন ইঞ্জিন
 Name[br]=Keflusker xine
 Name[ca]=Motor xine
 Name[cs]=xine
 Name[da]=xine-motor
 Name[de]=xine
 Name[el]=Μηχανή xine
 Name[eo]=xine Ilo
 Name[es]=Motor xine
 Name[et]=xine mootor
 Name[eu]=xine motorea
 Name[fa]=موتور xine
 Name[fi]=xine
 Name[fr]=Moteur xine
 Name[ga]=Inneall xine
 Name[gl]=Motor Xine
 Name[he]=מנוע שמע xine
 Name[hi]=एक्जाइन इंजिन
 Name[hu]=Xine alrendszer
 Name[is]=xine vél
 Name[it]=Motore xine
 Name[ja]=xine エンジン
 Name[ka]=xine dრავა
 Name[km]=ម៉ាស៊ីន xine
 Name[lt]=Xine variklis
 Name[mk]=xine-машина
 Name[ms]=Enjin xine
 Name[nb]=xine-motor
 Name[nds]=Xine
 Name[ne]=जाइन इन्जिन
 Name[nl]=xine-engine
 Name[nn]=xine-motor
 Name[pa]=xine ਇੰਜਣ
 Name[pl]=Wyjście xine
 Name[pt]=Motor Xine
 Name[pt_BR]=Mecanismo Xine
 Name[ru]=Xine
 Name[se]=xine-mohtor
 Name[sl]=Pogon xine
 Name[sq]=Motor Xine
 Name[sr]=Мотор Xine
 Name[sr@Latn]=Motor Xine
 Name[ss]=Motor Xine
 Name[sv]=Xine-gränssnitt
 Name[ta]=xine என்ஜின்
 Name[tg]=Муҳаррики xine
 Name[tr]=xine Motoru
 Name[uk]=Рушій xine
 Name[uz]=xine tizimi
 Name[uz@cyrillic]=xine тизими
 Name[wa]=Éndjin xine
 Name[zh_CN]=xine 引擎
 Name[zh_TW]=xine 解碼引擎
 X-KDE-Library=libamarok_xine-engine
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-name=xine-engine
 X-KDE-Amarok-authors=Max Howell
 X-KDE-Amarok-email=max.howell@methylblue.com
 X-KDE-Amarok-rank=255
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
 
diff --git a/src/engine/yauap/amarok_yauap-engine_plugin.desktop b/src/engine/yauap/amarok_yauap-engine_plugin.desktop
index c2e41f2320..d420385b8e 100644
--- a/src/engine/yauap/amarok_yauap-engine_plugin.desktop
+++ b/src/engine/yauap/amarok_yauap-engine_plugin.desktop
@@ -1,109 +1,109 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=yauap engine
 Name[af]=yauap enjin
 Name[bg]=Yauap
 Name[bn]=yauap ইঞ্জিন
 Name[ca]=Motor yauap
 Name[cs]=yauap
 Name[da]=Yauap-grænseflade
 Name[de]=Yauap
 Name[el]=μηχανή yauap
 Name[eo]=yauap ilo
 Name[es]=motor yauap
 Name[et]=yauap mootor
 Name[fa]=موتور yauap
 Name[fi]=yauap
 Name[fr]=Moteur yauap
 Name[ga]=inneall yauap
 Name[hu]=Yauap alrendszer
 Name[is]=yauap vél
 Name[it]=Motore yauap
 Name[ja]=yauap エンジン
 Name[ka]=yauap ძრავი
 Name[km]=ម៉ាស៊ីន yauap
 Name[lt]=yauap variklis
 Name[mk]=yauap-машина
 Name[ms]=Enjin yauap
 Name[nb]=yauap-motor
 Name[nds]=Yauap
 Name[ne]=yauap इन्जिन
 Name[nl]=yauap-engine
 Name[nn]=yauap-motor
 Name[pa]=yauap ਇੰਜਣ
 Name[pl]=moduł yauap
 Name[pt]=Motor yauap
 Name[pt_BR]=Mecanismo Yauap
 Name[se]=yauap-mohtor
 Name[sr]=Мотора yauap
 Name[sr@Latn]=Motora yauap
 Name[sv]=Yauap-gränssnitt
 Name[tr]=yauap motoru
 Name[uk]=Рушій yauap
 Name[uz]=yauap tizimi
 Name[uz@cyrillic]=yauap тизими
 Name[wa]=Éndjin yauap
 Name[zh_CN]=yauap 引擎
 Name[zh_TW]=yauap 引擎
 X-KDE-Library=libamarok_yauap-engine_plugin
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=engine
 X-KDE-Amarok-name=yauap-engine
 X-KDE-Amarok-authors=Sascha Sommer
 X-KDE-Amarok-email=ssommer@suse.de
 X-KDE-Amarok-rank=1
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
 
 
diff --git a/src/mediadevice/daap/amarok_daap-mediadevice.desktop b/src/mediadevice/daap/amarok_daap-mediadevice.desktop
index ae29a847e1..a3c4b3e509 100644
--- a/src/mediadevice/daap/amarok_daap-mediadevice.desktop
+++ b/src/mediadevice/daap/amarok_daap-mediadevice.desktop
@@ -1,110 +1,110 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=Music Sharing
 Name[af]=Musiek Deel
 Name[ar]=تبادل مشترك للموسيقة
 Name[bg]=Споделяне на музика
 Name[bn]=সঙ্গীত বিনিময়
 Name[ca]=Música compartida
 Name[cs]=Sdílení hudby
 Name[da]=Musikdeling
 Name[de]=Musikfreigabe
 Name[el]=Κοινή χρήση μουσικής
 Name[eo]=Muziko Fordonado
 Name[es]=Cliente DAAP
 Name[et]=Muusika jagamine
 Name[fa]=اشتراک موسیقی
 Name[fi]=Musiikinjako
 Name[fr]=Musique partagée
 Name[gl]=Compartir Música
 Name[hu]=Zenemegosztás
 Name[is]=Tónlistardeiling
 Name[it]=Condivisione musica
 Name[ja]=音楽共有
 Name[ka]=მუსიკის გაზიარება
 Name[km]=ការ​ចែករំលែក​តន្ត្រី
 Name[lt]=Dalinimasis muzika
 Name[mk]=Споделување музика
 Name[ms]=Perkongsian Muzik
 Name[nb]=Musikkdeling
 Name[nds]=Musikfreegaav
 Name[ne]=सङ्गीत साझेदारी
 Name[nl]=Muziek delen
 Name[nn]=Musikkdeling
 Name[pa]=ਸੰਗੀਤ ਸਾਂਝ
 Name[pl]=Dzielenie się muzyką
 Name[pt]=Partilha de Músicas
 Name[pt_BR]=Compartilhamento de Música
 Name[se]=Musihkkajuogadeapmi
 Name[sk]=Zdieľanie hudby
 Name[sr]=Дељење музике
 Name[sr@Latn]=Deljenje muzike
 Name[sv]=Musikdelning
 Name[th]=แบ่งปันดนตรี
 Name[tr]=Müzik Paylaşımı
 Name[uk]=Спільна музика
 Name[uz]=Musiqani boshqalar bilan boʻlishish
 Name[uz@cyrillic]=Мусиқани бошқалар билан бўлишиш
 Name[wa]=Pårtaedjî l' muzike
 Name[zh_CN]=音乐共享
 Name[zh_TW]=音樂分享
 X-KDE-Library=libamarok_daap-mediadevice
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=mediadevice
 X-KDE-Amarok-name=daap-mediadevice
 X-KDE-Amarok-authors=Ian Monroe
 X-KDE-Amarok-email=ian@monroe.nu
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
diff --git a/src/mediadevice/generic/amarok_generic-mediadevice.desktop b/src/mediadevice/generic/amarok_generic-mediadevice.desktop
index 7531547f2a..7307527b1c 100644
--- a/src/mediadevice/generic/amarok_generic-mediadevice.desktop
+++ b/src/mediadevice/generic/amarok_generic-mediadevice.desktop
@@ -1,111 +1,111 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=Generic Audio Player
 Name[af]=Generiese Oudio Speler
 Name[ar]= قارئ صوتي عام
 Name[bg]=Аудио плеър
 Name[bn]=সাধারণ অডিও প্লেয়ার
 Name[ca]=Reproductor d'àudio genèric
 Name[cs]=Běžný audio přehrávač
 Name[da]=Generisk lydafspiller
 Name[de]=Generischer Media-Player
 Name[el]=Γενικός αναπαραγωγέας ήχου
 Name[eo]=Ĝenerika Aŭdludilo
 Name[es]=Reproductor de audio genérico
 Name[et]=Üldine helifailide mängija
 Name[fa]=پخش‌کنندۀ صوتی عمومی
 Name[fi]=Yleinen musiikkisoitin
 Name[fr]=Lecteur audio générique
 Name[ga]=Seinnteoir Ginearálta Fuaime
 Name[gl]=Reprodutor de Áudio Xenérico
 Name[hu]=Általános zenelejátszó
 Name[is]=Almennur tónlistarspilari
 Name[it]=Lettore audio generico
 Name[ja]=一般的なオーディオプレーヤ
 Name[km]=កម្មវិធី​ចាក់​អូឌីយ៉ូ​ទូទៅ
 Name[lt]=Bendrasis muzikos grotuvas
 Name[mk]=Аудио-изведувач
 Name[ms]=Pemain Audio Generik
 Name[nb]=Musikkavspiller
 Name[nds]=Klangafspeler
 Name[ne]=जेनेरिक अडियो प्लेयर
 Name[nl]=Generieke audiospeler
 Name[nn]=Generell lydspelar
 Name[pa]=ਆਮ ਆਡੀਓ ਪਲੇਅਰ
 Name[pl]=Odtwarzacz audio
 Name[pt]=Leitor de Áudio Genérico
 Name[pt_BR]=Reprodutor de Áudio Genérico
 Name[ru]=Проигрыватель
 Name[se]=Jietnačuojaheaddji
 Name[sk]=Všeobecný audio prehrávač
 Name[sr]=Генерички аудио плејер
 Name[sr@Latn]=Generički audio plejer
 Name[sv]=Generell ljudspelare
 Name[th]=โปรแกรมเล่นเสียงทั่วไป
 Name[tr]=Genel Ses Çalar
 Name[uk]=Загальний аудіопрогравач
 Name[uz]=Oddiy audio-pleyer
 Name[uz@cyrillic]=Оддий аудио-плейер
 Name[wa]=Djouweu d' son djenerike
 Name[zh_CN]=通用音频播放器
 Name[zh_TW]=通用音樂播放程式
 X-KDE-Library=libamarok_generic-mediadevice
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=mediadevice
 X-KDE-Amarok-name=generic-mediadevice
 X-KDE-Amarok-authors=Jeff Mitchell
 X-KDE-Amarok-email=kde-dev@emailgoeshere.com
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
diff --git a/src/mediadevice/ifp/amarok_ifp-mediadevice.desktop b/src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
index dd383d6337..0507ae35c5 100644
--- a/src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
+++ b/src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
@@ -1,112 +1,112 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=iRiver iFP Media Device
 Name[af]=iRiver iFP media toestel
 Name[ar]=جهاز اخراج وسائط iRiver iFP
 Name[bg]=Устройство iRiver iFP
 Name[bn]=আই-রিভার আইএফপি মিডিয়া ডিভাইস
 Name[br]=Trobarzhell media iRiver iFP 
 Name[ca]=Dispositiu de suports iRiver iFP
 Name[cs]=Mediální zařízení iRiver iFP
 Name[da]=iRiver iFP-medieenhed
 Name[de]=iRiver iFP
 Name[el]=Συσκευή πολυμέσων iRiver iFP
 Name[eo]=iRiver iFP Media Ekipaĵo
 Name[es]=Dispositivo de medios iRiver iFP
 Name[et]=iRiver iFP meediaseade
 Name[fa]=دستگاه رسانۀ iRiver iFP
 Name[fi]=iRiver iFP -medialaite
 Name[fr]=Périphérique de média iRiver iFP
 Name[ga]=Gléas Meán iFP iRiver
 Name[gl]=iRiver iFP
 Name[hu]=iRiver iFP médiaeszköz
 Name[is]=iRiver iFP
 Name[it]=Dispositivo multimediale iRiver iFP
 Name[ja]=iRiver iFP メディアデバイス
 Name[ka]=მედია მოწყობილობა iRiver iFP
 Name[km]=ឧបករណ៍​មេឌៀ iFP របស់ iRiver
 Name[lt]=iRiver iFP media įrenginys
 Name[mk]=Уред за мултимедија iRiver iFP
 Name[nb]=iRiver iFP medieenhet
 Name[nds]=iFP-Medienreedschap vun iRiver
 Name[ne]=iRiver iFP मिडिया यन्त्र
 Name[nl]=iRiver iFP media-apparaat
 Name[nn]=iRiver iFP-medieeining
 Name[pa]=iRiver iFP ਮੀਡਿਆ ਜੰਤਰ
 Name[pl]=Urządzenie mediów iRiver iFP
 Name[pt]=Dispositivo Multimédia iRiver iFP
 Name[pt_BR]=Dispositivo de Mídia iRiver iFP
 Name[ru]=iRiver iFP
 Name[se]=iRiver iFP-mediaovttadat
 Name[sk]=iRiver iFP Media zariadenie
 Name[sr]=iRiver-ов iFP, мултимедијални уређај
 Name[sr@Latn]=iRiver-ov iFP, multimedijalni uređaj
 Name[sv]=iRiver iFP-mediaenhet
 Name[th]=อุปกรณ์เล่นสื่อ iRiver iFP
 Name[tr]=iRiver iFP Ortam Aygıtı
 Name[uk]=Пристрій носія iRiver iFP
 Name[uz]=iRiver iFP media-uskunasi
 Name[uz@cyrillic]=iRiver iFP медиа-ускунаси
 Name[wa]=Édjin d' media iRiver iFP
 Name[zh_CN]=iRiver iFP 媒体设备
 Name[zh_TW]=iRiver iFP 媒體裝置
 X-KDE-Library=libamarok_ifp-mediadevice
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=mediadevice
 X-KDE-Amarok-name=ifp-mediadevice
 X-KDE-Amarok-authors=Seb Ruiz
 X-KDE-Amarok-email=me@sebruiz.net
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
diff --git a/src/mediadevice/ipod/amarok_ipod-mediadevice.desktop b/src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
index 0539f58bf2..8f84a757e2 100644
--- a/src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
+++ b/src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
@@ -1,112 +1,112 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=Apple iPod Media Device
 Name[af]=Apple iPod media toestel
 Name[ar]=جهاز اخراج وسائط Apple iPod
 Name[bg]=Устройство Apple iPod
 Name[bn]=অ্যাপেল আইপড মিডিয়া ডিভাইস
 Name[br]=Trobarzhell media Apple iPod
 Name[ca]=Dispositiu de suports Apple iPod
 Name[cs]=Mediální zařízení Apple iPod
 Name[da]=Apple iPod-medieenhed
 Name[de]=Apple iPod
 Name[el]=Συσκευή πολυμέσων Apple iPod
 Name[eo]=Apple iPod Media Ekipaĵo
 Name[es]=Dispositivo de medios Apple iPod
 Name[et]=Apple iPod meediaseade
 Name[fa]=دستگاه رسانۀ Apple iPod
 Name[fi]=Apple iPod -medialaite
 Name[fr]=Périphérique de média Apple iPod
 Name[ga]=Gléas Meán iPod Apple
 Name[gl]=Apple iPod
 Name[hu]=Apple iPod médiaeszköz
 Name[is]=Apple iPod
 Name[it]=Dispositivo multimediale Apple iPod
 Name[ja]=Apple iPod メディアデバイス
 Name[ka]=მედია მოწყობილობა Apple iPod
 Name[km]=ឧបករណ៍​មេឌៀ iPod របស់​អ៊េផល
 Name[lt]=Apple iPod daugialypės terpės įrenginys
 Name[mk]=Уред за мултимедија Apple iPod
 Name[nb]=Apple iPod medieenhet
 Name[nds]=Apple-iPott
 Name[ne]=एप्पल iPod मिडिया यन्त्र
 Name[nl]=Apple iPod media-apparaat
 Name[nn]=Apple iPod-medieeining
 Name[pa]=Apple iPod ਮੀਡਿਆ ਜੰਤਰ
 Name[pl]=Urządzenie mediów Apple iPod
 Name[pt]=Dispositivo Multimédia Apple iPod
 Name[pt_BR]=Dispositivo de Mídia Apple iPod
 Name[ru]=Apple iPod
 Name[se]=Apple iPod-mediaovttadat
 Name[sk]=Apple iPod Media zariadenie
 Name[sr]=Apple-ов iPod, мултимедијални уређај
 Name[sr@Latn]=Apple-ov iPod, multimedijalni uređaj
 Name[sv]=Apple iPod-mediaenhet
 Name[th]=อุปกรณ์เล่นสื่อไอพ็อด ของแอปเปิล
 Name[tr]=Apple iPod Ortam Aygıtı
 Name[uk]=Пристрій носія Apple iPod
 Name[uz]=Apple iPod media-uskunasi
 Name[uz@cyrillic]=Apple iPod медиа-ускунаси
 Name[wa]=Édjin d' media Apple iPod
 Name[zh_CN]=Apple iPod 媒体设备
 Name[zh_TW]=Apple iPod 媒體裝置
 X-KDE-Library=libamarok_ipod-mediadevice
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=mediadevice
 X-KDE-Amarok-name=ipod-mediadevice
 X-KDE-Amarok-authors=Martin Aumueller
 X-KDE-Amarok-email=aumuell@reserv.at
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
diff --git a/src/mediadevice/mtp/amarok_mtp-mediadevice.desktop b/src/mediadevice/mtp/amarok_mtp-mediadevice.desktop
index 8b13c7a1ce..c27f7e5f86 100644
--- a/src/mediadevice/mtp/amarok_mtp-mediadevice.desktop
+++ b/src/mediadevice/mtp/amarok_mtp-mediadevice.desktop
@@ -1,110 +1,110 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=MTP Media Device
 Name[af]=MTP media toestel
 Name[bg]=Устройство MTP
 Name[bn]=এমটিপি মিডিয়া ডিভাইস
 Name[ca]=Dispositiu de suports MTP
 Name[cs]=Mediální zařízení MTP
 Name[da]=MTP-medieenhed
 Name[de]=MTP Media-Player
 Name[el]=Συσκευή πολυμέσων MTP
 Name[eo]=MTP Media Ekipaĵo
 Name[es]=Dispositivo MTP
 Name[et]=MTP meediaseade
 Name[fa]=دستگاه رسانۀ MTP
 Name[fi]=MTP-medialaite
 Name[fr]=Périphérique de média MTP
 Name[ga]=Gléas Meán MTP
 Name[gl]=Dispositivo de Médios MTP
 Name[hu]=MTP médiaeszköz
 Name[is]=MTP tæki
 Name[it]=Dispositivo multimediale MTP
 Name[ja]=MTP メディアデバイス
 Name[ka]=MTP მედია მოწყობილობა
 Name[km]=ឧបករណ៍​មេឌៀ MTP
 Name[lt]=MTP daugialypės terpės įrenginys
 Name[mk]=Уред за мултимедија MTP
 Name[ms]=Peranti Media MTP
 Name[nb]=MTP medieenhet
 Name[nds]=MTP-Medienreedschap
 Name[ne]=MTP मिडिया यन्त्र
 Name[nl]=MTP media-apparaat
 Name[nn]=MTP-medieeining
 Name[pa]=MTP ਮੀਡਿਆ ਜੰਤਰ
 Name[pl]=Urządzenie mediów MTP
 Name[pt]=Dispositivo Multimédia MTP
 Name[pt_BR]=Dispositivo de Mídia MTP
 Name[se]=MTP-mediaovttadat
 Name[sk]=MTP Media zariadenie
 Name[sr]=MTP, мултимедијални уређај
 Name[sr@Latn]=MTP, multimedijalni uređaj
 Name[sv]=MTP-mediaenhet
 Name[th]=อุปกรณ์เล่นสื่อ MTP
 Name[tr]=MTP Ortam Aygıtı
 Name[uk]=Пристрій носія MTP
 Name[uz]=MTP media-uskunasi
 Name[uz@cyrillic]=MTP медиа-ускунаси
 Name[wa]=Édjin d' media MTP
 Name[zh_CN]=MTP 媒体设备
 Name[zh_TW]=MTP 媒體裝置
 X-KDE-Library=libamarok_mtp-mediadevice
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=mediadevice
 X-KDE-Amarok-name=mtp-mediadevice
 X-KDE-Amarok-authors=Andy Kelk
 X-KDE-Amarok-email=andy@mopoke.co.uk
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
diff --git a/src/mediadevice/njb/amarok_njb-mediadevice.desktop b/src/mediadevice/njb/amarok_njb-mediadevice.desktop
index 6579e78914..97ad2023b0 100644
--- a/src/mediadevice/njb/amarok_njb-mediadevice.desktop
+++ b/src/mediadevice/njb/amarok_njb-mediadevice.desktop
@@ -1,109 +1,109 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=Creative Nomad Jukebox Media Device
 Name[af]=Creative Nomad Jukebox media toestel
 Name[ar]=جهاز اخراج وسائط Creative Nomad Jukebox
 Name[bg]=Устройство Creative Nomad Jukebox
 Name[bn]=ক্রিয়েটিভ নোমাড জুকবক্স মিডিয়া ডিভাইস
 Name[ca]=Dispositiu de suports Creative Nomad Jukebox
 Name[cs]=Mediální zařízení Creative Nomad Jukebox
 Name[da]=Creative Nomad Jukebox-medieenhed
 Name[de]=Creative Nomad Jukebox
 Name[el]=Συσκευή πολυμέσων Creative Nomad Jukebox
 Name[eo]=Creative Nomad Jukebox Media Ekipaĵo
 Name[es]=Dispositivo de medios VFAT genérico
 Name[et]=Creative Nomad Jukebox meediaseade
 Name[fa]=دستگاه رسانۀ Creative Nomad Jukebox
 Name[fi]=Creative Nomad Jukebox -medialaite
 Name[fr]=Périphérique Creative Nomad Jukebox
 Name[gl]=Dispositivo Multimedio Creative Nomad Jukebox
 Name[hu]=Creative Nomad Jukebox médiaeszköz
 Name[is]=Creative Nomad Jukebox
 Name[it]=Dispositivo multimediale Creative Nomad Jukebox
 Name[ja]=Creative Nomad Jukebox メディアデバイス
 Name[ka]=Creative Nomad Jukebox მედია მოწყობილობა
 Name[km]=ឧបករណ៍​មេឌៀ Nomad Jukebox របស់ Creative
 Name[lt]=Creative Nomad Jukebox daugialypės terpės įrenginys
 Name[mk]=Уред за мултимедија Creative Nomad Jukebox
 Name[nb]=Creative Nomad Jukebox medieenhet
 Name[nds]=Creative-Medienreedschap Nomad Jukebox
 Name[ne]=सिर्जानात्मक नोम्याड जुकेबक्स मिडिया यन्त्र
 Name[nl]=Creative Nomad Jukebox media-apparaat
 Name[nn]=Creative Nomad Jukebox-medieeining
 Name[pa]=ਕਰੀਏਟਵ ਨੋਮਡ ਜੂਕਬਕਸ ਮੀਡਿਆ ਜੰਤਰ
 Name[pl]=Urządzenie mediów Creative Nomad Jukebox
 Name[pt]=Dispositivo Multimédia Creative Nomad Jukebox
 Name[pt_BR]=Dispositivo de Mídia Creative Nomad Jukebox
 Name[ru]=Creative Nomad Jukebox
 Name[se]=Creative Nomad Jukebox-mediaovttadat
 Name[sk]=Creative Nomad Jukebox Media zariadenie
 Name[sr]=Creative-ов мултимедијални уређај Nomad Jukebox
 Name[sr@Latn]=Creative-ov multimedijalni uređaj Nomad Jukebox
 Name[sv]=Creative Nomad Jukebox-mediaenhet
 Name[th]=อุปกรณ์เล่นสื่อ Creative Nomad Jukebox
 Name[tr]=Creative Nomad Jukebox Ortam Aygıtı
 Name[uk]=Пристрій носія Nomad Jukebox
 Name[uz]=Creative Nomad Jukebox media-uskunasi
 Name[uz@cyrillic]=Creative Nomad Jukebox медиа-ускунаси
 Name[wa]=Édjin d' media Creative Nomad Jukebox
 Name[zh_CN]=Creative Nomad Jukebox 媒体设备
 Name[zh_TW]=Creative Nomad Jukebox 媒體裝置
 X-KDE-Library=libamarok_njb-mediadevice
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 X-KDE-Amarok-plugintype=mediadevice
 X-KDE-Amarok-name=njb-mediadevice
 X-KDE-Amarok-authors=Andres Oton, T.R.Shashwath
 X-KDE-Amarok-email=andres.oton@gmail.com, trshash84@gmail.com
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
diff --git a/src/mediadevice/riokarma/amarok_riokarma-mediadevice.desktop b/src/mediadevice/riokarma/amarok_riokarma-mediadevice.desktop
index 3e6a9509b6..0f61041c2e 100644
--- a/src/mediadevice/riokarma/amarok_riokarma-mediadevice.desktop
+++ b/src/mediadevice/riokarma/amarok_riokarma-mediadevice.desktop
@@ -1,109 +1,109 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
 Name=Rio Karma Media Device
 Name[af]=Rio Karma media toestel
 Name[bg]=Устройство Rio Karma
 Name[bn]=রিও কর্মা মিডিয়া ডিভাইস
 Name[ca]=Dispositiu de suports Rio Karma
 Name[cs]=Mediální zařízení Rio Karma
 Name[da]=Rio Karma-medieenhed
 Name[de]=Rio Karma Media-Player
 Name[el]=Συσκευή πολυμέσων Rio Karma
 Name[eo]=Rio Karma Media Ekipaĵo
 Name[es]=Dispositivo Rio Karma
 Name[et]=Rio Karma meediaseade
 Name[fa]=دستگاه رسانۀ Rio Karma
 Name[fi]=Rio Karma -medialaite
 Name[fr]=Périphérique de média Rio Karma
 Name[ga]=Gléas Meán Rio Karma
 Name[hu]=Rio Karma médiaeszköz
 Name[is]=Rio Karma
 Name[it]=Dispositivo multimediale Rio Karma
 Name[ja]=Rio Karma メディアデバイス
 Name[ka]=Rio Karma მედია მოწყობილობა
 Name[km]=ឧបករណ៍​មេឌៀ Rio Karma
 Name[lt]=Rio Karma daugialypės terpės įrenginys
 Name[mk]=Уред за мултимедија Rio Karma
 Name[ms]=Peranti Media Rio Karma
 Name[nb]=Rio Karma medieenhet
 Name[nds]=Medienreedschap Rio Karma
 Name[ne]=रियो कर्म मिडिया यन्त्र
 Name[nl]=Rio Karma media-apparaat
 Name[nn]=Rio Karma-medieeining
 Name[pa]=Rio ਕਰਮਾ ਮੀਡਿਆ ਜੰਤਰ
 Name[pl]=Urządzenie mediów Rio Karma
 Name[pt]=Dispositivo Multimédia Rio Karma
 Name[pt_BR]=Dispositivo de Mídia Rio Karma
 Name[se]=Rio Karma-mediaovttadat
 Name[sk]=Rio Karma Media zariadenie
 Name[sr]=Rio Karma, мултимедијални уређај
 Name[sr@Latn]=Rio Karma, multimedijalni uređaj
 Name[sv]=Rio Karma-mediaenhet
 Name[th]=อุปกรณ์เล่นสื่อ Rio Karma
 Name[tr]=Rio Karma Ortam Aygıtı
 Name[uk]=Пристрій носія Rio Karma
 Name[uz]=Rio Karma media-uskunasi
 Name[uz@cyrillic]=Rio Karma медиа-ускунаси
 Name[wa]=Édjin d' media Rio Karma
 Name[zh_CN]=Rio Karma 媒体设备
 Name[zh_TW]=Rio Karma 媒體裝置
 X-KDE-Library=libamarok_riokarma-mediadevice
 Comment=Plugin for Amarok
 Comment[af]=Inprop module vir Amarok
 Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
 Comment[bg]=Приставка за Amarok
 Comment[bn]=আমারক-এর জন্য প্লাগিন
 Comment[br]=Lugent evit Amarok
 Comment[ca]=Connector per l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[de]=Modul für Amarok
 Comment[el]=Πρόσθετο για το AmaroK
 Comment[eo]=Kromaĵo por Amarok
 Comment[es]=Extensión para Amarok
 Comment[et]=Amaroki plugin
 Comment[fa]=وصله برای amaroK
 Comment[fi]=Amarok-liitännäinen
 Comment[fr]=Module pour Amarok
 Comment[ga]=Breiseán AmaroK
 Comment[gl]=Extensión para Amarok
 Comment[hu]=Bővítőmodul az Amarokhoz
 Comment[is]=Íforrit fyrir Amarok
 Comment[it]=Plugin per Amarok
 Comment[ja]=Amarok のためのプラグイン
 Comment[ka]=მოდული Amarok-ისთვის
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
 Comment[nl]=Plugin voor Amarok
 Comment[nn]=Programtillegg for Amarok
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
 Comment[pt_BR]=Plugin para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
 Comment[sr]=Прикључак за Amarok
 Comment[sr@Latn]=Priključak za Amarok
 Comment[sv]=Insticksprogram för Amarok
 Comment[th]=โปรแกรมเสริมสำหรับ Amarok
 Comment[tr]=Amarok için Eklenti
 Comment[uk]=Втулок для Amarok
 Comment[uz]=Amarok uchun plagin
 Comment[uz@cyrillic]=Amarok учун плагин
 Comment[wa]=Tchôke-divins po Amarok
 Comment[zh_CN]=Amarok 插件
 Comment[zh_TW]=amaroK 插件
 ServiceTypes=Amarok/Plugin
 
 X-KDE-Amarok-plugintype=mediadevice
 X-KDE-Amarok-name=riokarma-mediadevice
 X-KDE-Amarok-authors=Andy Kelk
 X-KDE-Amarok-email=andy@mopoke.co.uk
 X-KDE-Amarok-rank=100
 X-KDE-Amarok-version=1
-X-KDE-Amarok-framework-version=31
+X-KDE-Amarok-framework-version=32
diff --git a/src/pluginmanager.h b/src/pluginmanager.h
index e302b87864..787829e2d2 100644
--- a/src/pluginmanager.h
+++ b/src/pluginmanager.h
@@ -1,114 +1,114 @@
 /***************************************************************************
 begin                : 2004/03/12
 copyright            : (C) Mark Kretschmann
 email                : markey@web.de
 ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef AMAROK_PLUGINMANAGER_H
 #define AMAROK_PLUGINMANAGER_H
 
 #include <vector>
 
 #include <kservice.h>
 #include <ktrader.h>
 
 namespace Amarok { class Plugin; }
 class KLibrary;
 
 class PluginManager
 {
     public:
         /** Bump this number whenever the plugin framework gets incompatible with older versions */
-        static const int FrameworkVersion = 31;
+        static const int FrameworkVersion = 32;
 
         /**
          * It will return a list of services that match your
          * specifications.  The only required parameter is the service
          * type.  This is something like 'text/plain' or 'text/html'.  The
          * constraint parameter is used to limit the possible choices
          * returned based on the constraints you give it.
          *
          * The @p constraint language is rather full.  The most common
          * keywords are AND, OR, NOT, IN, and EXIST, all used in an
          * almost spoken-word form.  An example is:
          * \code
          * (Type == 'Service') and (('KParts/ReadOnlyPart' in ServiceTypes) or (exist Exec))
          * \endcode
          *
          * The keys used in the query (Type, ServiceType, Exec) are all
          * fields found in the .desktop files.
          *
          * @param constraint  A constraint to limit the choices returned, QString::null to
          *                    get all services of the given @p servicetype
          *
          * @return            A list of services that satisfy the query
          * @see               http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html
          */
         static KTrader::OfferList query( const QString& constraint = QString::null );
 
         /**
          * Load and instantiate plugin from query
          * @param constraint  A constraint to limit the choices returned, QString::null to
          *                    get all services of the given @p servicetype
          * @return            Pointer to Plugin, or NULL if error
          * @see               http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html
          */
         static Amarok::Plugin* createFromQuery( const QString& constraint = QString::null );
 
         /**
          * Load and instantiate plugin from service
          * @param service     Pointer to KService
          * @return            Pointer to Plugin, or NULL if error
          */
         static Amarok::Plugin* createFromService( const KService::Ptr service );
 
         /**
          * Remove library and delete plugin
          * @param plugin      Pointer to plugin
          */
         static void unload( Amarok::Plugin* plugin );
 
         /**
          * Look up service for loaded plugin from store
          * @param pointer     Pointer to plugin
          * @return            KService, or 0 if not found
          */
         static KService::Ptr getService( const Amarok::Plugin* plugin );
 
         /**
          * Dump properties from a service to stdout for debugging
          * @param service     Pointer to KService
          */
         static void dump( const KService::Ptr service );
 
        /**
          * Show modal info dialog about plugin
          * @param constraint  A constraint to limit the choices returned
          */
         static void showAbout( const QString& constraint );
 
     private:
         struct StoreItem {
             Amarok::Plugin* plugin;
             KLibrary* library;
             KService::Ptr service;
         };
 
         static std::vector<StoreItem>::iterator lookupPlugin( const Amarok::Plugin* plugin );
 
     //attributes:
         static std::vector<StoreItem> m_store;
 };
 
 
 #endif /* AMAROK_PLUGINMANAGER_H */