Merge branch 'master' into pu/mp

data/icons/slider/Makefile.am

@@ -1,9 +1,9 @@
 installdir = $(ICONSDIR)
 
 install_DATA = \
-	volumebody.png \
-	volumeslider2.png \
-	volumeslider2alpha.png \
-	volumeslider2blue.png \
-	volumeslider2green.png \
-	volumeslider2red.png
+	slider_alpha.png \
+	slider_blue.png \
+	slider_body.png \
+	slider_green.png \
+	slider_inactive.png \
+	slider_red.png

data/locale/deutsch.locale

@@ -873,8 +873,7 @@ keybindingmenu.volumedown Leiser
 keybindingmenu.volumeup Lauter
 keybindingmenu.zaphistory Zapping-History Bouquet
 keychooser.head Neue Taste einstellen
-keychooser.text1 Bitte Taste drücken
-keychooser.text2 Zum Abbrechen warten ...
+keychooser.text Neue Taste drücken.\nZum Abbrechen ein paar Sekunden warten ...
 keychoosermenu.currentkey Derzeitige Taste
 keychoosermenu.setnew Neue Taste einstellen
 keychoosermenu.setnone Keine Taste

data/locale/english.locale

@@ -872,9 +872,8 @@ keybindingmenu.volume Volume
 keybindingmenu.volumedown Decrease
 keybindingmenu.volumeup Increase
 keybindingmenu.zaphistory Zapping History Bouquet
-keychooser.head Setup new Key
-keychooser.text1 Please press the new key
-keychooser.text2 wait a few seconds for abort
+keychooser.head Setup new key
+keychooser.text Press new key.\nWait a few seconds to abort ...
 keychoosermenu.currentkey current key
 keychoosermenu.setnew setup new key
 keychoosermenu.setnone no key