Skip to content

V
vlc-gpu
Commit 1403f3a0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Merge branch 1.0-bugfix

parents 224e96f2 a11122ee
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 11 deletions
modules/gui/qt4/dialogs/help.cpp
View file @ 1403f3a0
...@@ -96,7 +96,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf) ...@@ -96,7 +96,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
closeButton->setDefault( true ); closeButton->setDefault( true );
QLabel *introduction = new QLabel( QLabel *introduction = new QLabel(
qtr( "VLC media player" " " VERSION_MESSAGE ) ); qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE );
QLabel *iconVLC = new QLabel; QLabel *iconVLC = new QLabel;
if( QDate::currentDate().dayOfYear() >= 354 ) if( QDate::currentDate().dayOfYear() >= 354 )
iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) ); iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) );
......
po/de.po
View file @ 1403f3a0
...@@ -25137,13 +25137,11 @@ msgid "(Experimental) XCB video window" ...@@ -25137,13 +25137,11 @@ msgid "(Experimental) XCB video window"
msgstr "DirectX-Videoausgabe" msgstr "DirectX-Videoausgabe"
#: modules/video_output/xcb/window.c:165 #: modules/video_output/xcb/window.c:165
#, fuzzy
msgctxt "ASCII" msgctxt "ASCII"
msgid "VLC media player" msgid "VLC media player"
msgstr "VLC media player" msgstr "VLC media player"
#: modules/video_output/xcb/window.c:167 #: modules/video_output/xcb/window.c:167
#, fuzzy
msgctxt "ASCII" msgctxt "ASCII"
msgid "VLC" msgid "VLC"
msgstr "VLC" msgstr "VLC"
......
po/fi.po
View file @ 1403f3a0
...@@ -24610,13 +24610,11 @@ msgid "(Experimental) XCB video window" ...@@ -24610,13 +24610,11 @@ msgid "(Experimental) XCB video window"
msgstr "(Kokeellinen) XCB videoulostulo" msgstr "(Kokeellinen) XCB videoulostulo"
#: modules/video_output/xcb/window.c:165 #: modules/video_output/xcb/window.c:165
#, fuzzy
msgctxt "ASCII" msgctxt "ASCII"
msgid "VLC media player" msgid "VLC media player"
msgstr "VLC-mediasoitin" msgstr "VLC-mediasoitin"
#: modules/video_output/xcb/window.c:167 #: modules/video_output/xcb/window.c:167
#, fuzzy
msgctxt "ASCII" msgctxt "ASCII"
msgid "VLC" msgid "VLC"
msgstr "VLC" msgstr "VLC"
......
po/fr.po
View file @ 1403f3a0
...@@ -24592,13 +24592,11 @@ msgid "(Experimental) XCB video window" ...@@ -24592,13 +24592,11 @@ msgid "(Experimental) XCB video window"
msgstr "Sortie vidéo « XCB » (expérimental)" msgstr "Sortie vidéo « XCB » (expérimental)"
#: modules/video_output/xcb/window.c:165 #: modules/video_output/xcb/window.c:165
#, fuzzy
msgctxt "ASCII" msgctxt "ASCII"
msgid "VLC media player" msgid "VLC media player"
msgstr "Lecteur multimédia VLC" msgstr "Lecteur multimedia VLC"
#: modules/video_output/xcb/window.c:167 #: modules/video_output/xcb/window.c:167
#, fuzzy
msgctxt "ASCII" msgctxt "ASCII"
msgid "VLC" msgid "VLC"
msgstr "VLC" msgstr "VLC"
......
po/sv.po
View file @ 1403f3a0
...@@ -24171,16 +24171,14 @@ msgid "(Experimental) XCB video window" ...@@ -24171,16 +24171,14 @@ msgid "(Experimental) XCB video window"
msgstr "Videoutmatning med DirectX" msgstr "Videoutmatning med DirectX"
#: modules/video_output/xcb/window.c:165 #: modules/video_output/xcb/window.c:165
#, fuzzy
msgctxt "ASCII" msgctxt "ASCII"
msgid "VLC media player" msgid "VLC media player"
msgstr "Mediaspelaren VLC" msgstr "Mediaspelaren VLC"
#: modules/video_output/xcb/window.c:167 #: modules/video_output/xcb/window.c:167
#, fuzzy
msgctxt "ASCII" msgctxt "ASCII"
msgid "VLC" msgid "VLC"
msgstr "VLM" msgstr "VLC"
#: modules/video_output/yuv.c:51 #: modules/video_output/yuv.c:51
msgid "device, fifo or filename" msgid "device, fifo or filename"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment