Merge branch 1.0-bugfix

modules/gui/qt4/dialogs/help.cpp

@@ -96,7 +96,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
     closeButton->setDefault( true );
 
     QLabel *introduction = new QLabel(
-            qtr( "VLC media player" " " VERSION_MESSAGE ) );
+            qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE );
     QLabel *iconVLC = new QLabel;
     if( QDate::currentDate().dayOfYear() >= 354 )
         iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) );

po/de.po

@@ -25137,13 +25137,11 @@ msgid "(Experimental) XCB video window"
 msgstr "DirectX-Videoausgabe"
 
 #: modules/video_output/xcb/window.c:165
-#, fuzzy
 msgctxt "ASCII"
 msgid "VLC media player"
 msgstr "VLC media player"
 
 #: modules/video_output/xcb/window.c:167
-#, fuzzy
 msgctxt "ASCII"
 msgid "VLC"
 msgstr "VLC"

po/fi.po

@@ -24610,13 +24610,11 @@ msgid "(Experimental) XCB video window"
 msgstr "(Kokeellinen) XCB videoulostulo"
 
 #: modules/video_output/xcb/window.c:165
-#, fuzzy
 msgctxt "ASCII"
 msgid "VLC media player"
 msgstr "VLC-mediasoitin"
 
 #: modules/video_output/xcb/window.c:167
-#, fuzzy
 msgctxt "ASCII"
 msgid "VLC"
 msgstr "VLC"

po/fr.po

@@ -24592,13 +24592,11 @@ msgid "(Experimental) XCB video window"
 msgstr "Sortie vidéo « XCB » (expérimental)"
 
 #: modules/video_output/xcb/window.c:165
-#, fuzzy
 msgctxt "ASCII"
 msgid "VLC media player"
-msgstr "Lecteur multimédia VLC"
+msgstr "Lecteur multimedia VLC"
 
 #: modules/video_output/xcb/window.c:167
-#, fuzzy
 msgctxt "ASCII"
 msgid "VLC"
 msgstr "VLC"

po/sv.po

@@ -24171,16 +24171,14 @@ msgid "(Experimental) XCB video window"
 msgstr "Videoutmatning med DirectX"
 
 #: modules/video_output/xcb/window.c:165
-#, fuzzy
 msgctxt "ASCII"
 msgid "VLC media player"
 msgstr "Mediaspelaren VLC"
 
 #: modules/video_output/xcb/window.c:167
-#, fuzzy
 msgctxt "ASCII"
 msgid "VLC"
-msgstr "VLM"
+msgstr "VLC"
 
 #: modules/video_output/yuv.c:51
 msgid "device, fifo or filename"