Commit 2b452b3c authored by Christophe Mutricy's avatar Christophe Mutricy

All: Qt4 intf i18n fix (part 1)

parent 2ede4ca7
......@@ -363,7 +363,6 @@ AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
])
])
AC_SUBST(INCLUDED_LIBINTL)
XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
dnl
dnl Iconv stuff
......
......@@ -44,12 +44,12 @@ MetaPanel::MetaPanel( QWidget *parent, intf_thread_t *_p_intf ) :
int line = 0;
QGridLayout *l = new QGridLayout( this );
#define ADD_META( string, widget ) { \
l->addWidget( new QLabel( qfu( string ) ), line, 0 ); \
l->addWidget( new QLabel( qtr( string ) ), line, 0 ); \
widget = new QLabel( "" ); \
l->addWidget( widget, line, 1 ); \
line++; }
ADD_META( _( "Name" ), name_text );
ADD_META( _( "URI" ), uri_text );
ADD_META( qtr( "Name" ), name_text );
ADD_META( qtr( "URI" ), uri_text );
ADD_META( VLC_META_ARTIST, artist_text );
ADD_META( VLC_META_GENRE, genre_text );
ADD_META( VLC_META_COPYRIGHT, copyright_text );
......
......@@ -63,10 +63,10 @@ void PlaylistDialog::createPlMenuBar( QMenuBar *bar, intf_thread_t *p_intf )
{
QMenu *manageMenu = new QMenu();
manageMenu->setTitle( qtr("Manage") );
manageMenu->addAction( "Open playlist file", THEDP, SLOT( openPlaylist() ),
manageMenu->addAction( qtr("Open playlist file"), THEDP, SLOT( openPlaylist() ),
qtr( "Ctrl+L") );
manageMenu->addSeparator();
manageMenu->addAction( "Dock playlist", this, SLOT( dock() ),
manageMenu->addAction( qtr("Dock playlist"), this, SLOT( dock() ),
qtr( "Ctrl+U" ) );
bar->addMenu( manageMenu );
bar->addMenu( QVLCMenu::SDMenu( p_intf ) );
......
......@@ -281,7 +281,7 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
{
menu->addSeparator();
menu->addAction( qtr("Switch to skins"), THEDP, SLOT(switchToSkins()),
qtr("Ctrl+Z") );
"Ctrl+Z" );
}
CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
......
......@@ -23,7 +23,7 @@
<item>
<widget class="QCheckBox" name="enableAudio" >
<property name="text" >
<string>Enable audio</string>
<string>_("Enable audio")</string>
</property>
<property name="checked" >
<bool>true</bool>
......@@ -33,7 +33,7 @@
<item>
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>General Audio</string>
<string>_("General Audio")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -45,7 +45,7 @@
<item row="2" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Force detection of Dolby Surround</string>
<string>_("Force detection of Dolby Surround")</string>
</property>
</widget>
</item>
......@@ -73,14 +73,14 @@
<item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="spdifBox" >
<property name="text" >
<string>Use S/PDIF when available</string>
<string>_("Use S/PDIF when available")</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Preferred audio language</string>
<string>_("Preferred audio language")</string>
</property>
</widget>
</item>
......@@ -108,7 +108,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Default volume</string>
<string>_("Default volume")</string>
</property>
</widget>
</item>
......@@ -136,21 +136,21 @@
<item row="4" column="2" >
<widget class="QPushButton" name="fileBrowseButton" >
<property name="text" >
<string>Browse...</string>
<string>_("Browse...")</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<string>File</string>
<string>_("File")</string>
</property>
</widget>
</item>
<item row="3" column="2" >
<widget class="QPushButton" name="OSSBrowse" >
<property name="text" >
<string>Browse...</string>
<string>_("Browse...")</string>
</property>
</widget>
</item>
......@@ -160,14 +160,14 @@
<item row="3" column="0" >
<widget class="QLabel" name="OSSLabel" >
<property name="text" >
<string>OSS Device</string>
<string>_("OSS Device")</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="DirectXLabel" >
<property name="text" >
<string>DirectX Device</string>
<string>_("DirectX Device")</string>
</property>
</widget>
</item>
......@@ -177,7 +177,7 @@
<item row="1" column="0" >
<widget class="QLabel" name="alsaLabel" >
<property name="text" >
<string>Alsa Device</string>
<string>_("Alsa Device")</string>
</property>
</widget>
</item>
......@@ -190,7 +190,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Type</string>
<string>_("Type")</string>
</property>
</widget>
</item>
......@@ -200,7 +200,7 @@
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Effects</string>
<string>_("Effects")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -215,21 +215,21 @@
<item row="0" column="0" >
<widget class="QCheckBox" name="headphoneEffect" >
<property name="text" >
<string>Headphone surround effect</string>
<string>_("Headphone surround effect")</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QCheckBox" name="volumeNormalizer" >
<property name="text" >
<string>Volume normalizer</string>
<string>_("Volume normalizer")</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Visualisation</string>
<string>_("Visualisation")</string>
</property>
</widget>
</item>
......
......@@ -23,7 +23,7 @@
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Disk Devices</string>
<string>_("Disk Devices")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -35,7 +35,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Disk Device</string>
<string>_("Disk Device")</string>
</property>
</widget>
</item>
......@@ -45,7 +45,7 @@
<item row="0" column="2" >
<widget class="QPushButton" name="DVDBrowse" >
<property name="text" >
<string>Browse...</string>
<string>_("Browse...")</string>
</property>
</widget>
</item>
......@@ -55,7 +55,7 @@
<item>
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Network</string>
<string>_("Network")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -67,14 +67,14 @@
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Default Network caching in ms</string>
<string>_("Default Network caching in ms")</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<string>HTTP Proxy</string>
<string>_("HTTP Proxy")</string>
</property>
</widget>
</item>
......@@ -113,7 +113,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Server Default Port</string>
<string>_("Server Default Port")</string>
</property>
</widget>
</item>
......@@ -123,7 +123,7 @@
<item>
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>Codecs / Muxers</string>
<string>_("Codecs / Muxers")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -135,7 +135,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Post-Processing Quality</string>
<string>_("Post-Processing Quality")</string>
</property>
</widget>
</item>
......@@ -158,7 +158,7 @@
<item row="1" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<string>Repair AVI files</string>
<string>_("Repair AVI files")</string>
</property>
</widget>
</item>
......@@ -168,14 +168,14 @@
<item row="3" column="0" colspan="2" >
<widget class="QCheckBox" name="systemCodecBox" >
<property name="text" >
<string>Use system codecs if available (better quality)</string>
<string>_("Use system codecs if available (better quality)")</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="RTSP_TCPBox" >
<property name="text" >
<string>Use RTP over RTSP (TCP)</string>
<string>_("Use RTP over RTSP (TCP)")</string>
</property>
</widget>
</item>
......@@ -185,7 +185,7 @@
<item>
<widget class="QGroupBox" name="groupBox_4" >
<property name="title" >
<string>Access Filter</string>
<string>_("Access Filter")</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
......@@ -197,21 +197,21 @@
<item>
<widget class="QCheckBox" name="timeshiftBox" >
<property name="text" >
<string>Timeshift</string>
<string>_("Timeshift")</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="RecordBox" >
<property name="text" >
<string>Record</string>
<string>_("Record")</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="DumpBox" >
<property name="text" >
<string>Dump</string>
<string>_("Dump")</string>
</property>
</widget>
</item>
......
......@@ -22,7 +22,7 @@
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Default Interface</string>
<string>_("Default Interface")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -52,7 +52,7 @@
<enum>QFrame::NoFrame</enum>
</property>
<property name="text" >
<string>This is VLC's skinnable interface. You can download skins at http://www.videolan.org/vlc/skins.php to customize your player.</string>
<string>_("This is VLC's skinnable interface. You can download skins at http://www.videolan.org/vlc/skins.php to customize your player.")</string>
</property>
<property name="alignment" >
<set>Qt::AlignBottom|Qt::AlignJustify</set>
......@@ -71,14 +71,14 @@
<item row="4" column="2" >
<widget class="QPushButton" name="skinBrowse" >
<property name="text" >
<string>Browse...</string>
<string>_("Browse...")</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Skin File</string>
<string>_("Skin File")</string>
</property>
</widget>
</item>
......@@ -91,7 +91,7 @@
<enum>QFrame::NoFrame</enum>
</property>
<property name="text" >
<string>This is VLC's default interface, with a native look and feel.</string>
<string>_("This is VLC's default interface, with a native look and feel.")</string>
</property>
<property name="textFormat" >
<enum>Qt::RichText</enum>
......@@ -107,21 +107,21 @@
<item row="0" column="0" >
<widget class="QRadioButton" name="qt4" >
<property name="text" >
<string>Default</string>
<string>_("Default")</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QRadioButton" name="skins" >
<property name="text" >
<string>Skins</string>
<string>_("Skins")</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2" >
<widget class="QCheckBox" name="qtAlwaysVideo" >
<property name="text" >
<string>Always display the video</string>
<string>_("Always display the video")</string>
</property>
</widget>
</item>
......@@ -134,14 +134,14 @@
<item row="0" column="0" >
<widget class="QLabel" name="languageLabel" >
<property name="text" >
<string>Language</string>
<string>_("Language")</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QGroupBox" name="OneInterfaceBox" >
<property name="title" >
<string>Instances</string>
<string>_("Instances")</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
......@@ -153,14 +153,14 @@
<item>
<widget class="QCheckBox" name="OneInterfaceMode" >
<property name="text" >
<string>Allow only one instance</string>
<string>_("Allow only one instance")</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
<property name="text" >
<string>Enqueue files in playlist when in one interface mode</string>
<string>_("Enqueue files in playlist when in one interface mode")</string>
</property>
</widget>
</item>
......
......@@ -23,7 +23,7 @@
<item>
<widget class="QCheckBox" name="enableVideo" >
<property name="text" >
<string>Enable video</string>
<string>_("Enable video")</string>
</property>
<property name="checked" >
<bool>true</bool>
......@@ -33,7 +33,7 @@
<item>
<widget class="QGroupBox" name="displayBox" >
<property name="title" >
<string>Display</string>
<string>_("Display")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -45,7 +45,7 @@
<item row="1" column="2" >
<widget class="QCheckBox" name="windowDecorations" >
<property name="text" >
<string>Window decorations</string>
<string>_("Window decorations")</string>
</property>
<property name="checked" >
<bool>true</bool>
......@@ -58,14 +58,14 @@
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="fullscreen" >
<property name="text" >
<string>Fullscreen</string>
<string>_("Fullscreen")</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="alwaysOnTop" >
<property name="text" >
<string>Always on top</string>
<string>_("Always on top")</string>
</property>
</widget>
</item>
......@@ -75,14 +75,14 @@
<item row="3" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Output</string>
<string>_("Output")</string>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QCheckBox" name="overlay" >
<property name="text" >
<string>Accelerated video output</string>
<string>_("Accelerated video output")</string>
</property>
<property name="checked" >
<bool>true</bool>
......@@ -95,7 +95,7 @@
<item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="skipFrames" >
<property name="text" >
<string>Skip Frames</string>
<string>_("Skip Frames")</string>
</property>
<property name="checked" >
<bool>true</bool>
......@@ -105,7 +105,7 @@
<item row="2" column="2" >
<widget class="QCheckBox" name="overlay" >
<property name="text" >
<string>Overlay</string>
<string>_("Overlay")</string>
</property>
<property name="checked" >
<bool>true</bool>
......@@ -118,7 +118,7 @@
<item>
<widget class="QGroupBox" name="directXBox" >
<property name="title" >
<string>DirectX</string>
<string>_("DirectX")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -133,14 +133,14 @@
<item row="1" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Display Device</string>
<string>_("Display Device")</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="wallpaperMode" >
<property name="text" >
<string>Enable Wallpaper Mode</string>
<string>_("Enable Wallpaper Mode")</string>
</property>
</widget>
</item>
......@@ -150,7 +150,7 @@
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Video snapshots</string>
<string>_("Video snapshots")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -165,21 +165,21 @@
<item row="0" column="3" >
<widget class="QPushButton" name="snapshotsDirectoryBrowse" >
<property name="text" >
<string>Browse...</string>
<string>_("Browse...")</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Directory</string>
<string>_("Directory")</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Prefix</string>
<string>_("Prefix")</string>
</property>
</widget>
</item>
......@@ -193,7 +193,7 @@
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Format</string>
<string>_("Format")</string>
</property>
</widget>
</item>
......@@ -203,7 +203,7 @@
<item row="1" column="2" colspan="2" >
<widget class="QCheckBox" name="snapshotsSequentialNumbering" >
<property name="text" >
<string>Sequential numbering</string>
<string>_("Sequential numbering")</string>
</property>
</widget>
</item>
......
......@@ -22,14 +22,14 @@
<item row="11" column="0" >
<widget class="QCheckBox" name="invertEnable" >
<property name="text" >
<string>Color invert</string>
<string>_("Color invert")</string>
</property>
</widget>
</item>
<item rowspan="4" row="7" column="0" >
<widget class="QGroupBox" name="colorthresEnable" >
<property name="title" >
<string>Color threshold</string>
<string>_("Color threshold")</string>
</property>
<property name="checkable" >
<bool>true</bool>
......@@ -47,7 +47,7 @@
<item row="4" column="0" >
<widget class="QLabel" name="label_14" >
<property name="text" >
<string>Similarity</string>
<string>_("Similarity")</string>
</property>
</widget>
</item>
......@@ -68,7 +68,7 @@
<item row="3" column="0" >
<widget class="QLabel" name="label_13" >
<property name="text" >
<string>Saturation</string>
<string>_("Saturation")</string>
</property>
</widget>
</item>
......@@ -120,7 +120,7 @@
<item rowspan="3" row="9" column="2" colspan="3" >
<widget class="QGroupBox" name="advancedVideoFilterBox" >
<property name="title" >
<string>Advanced video filter controls</string>
<string>_("Advanced video filter controls")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -138,35 +138,35 @@
<item row="3" column="0" colspan="2" >
<widget class="QPushButton" name="filtersResetButton" >
<property name="text" >
<string>Reset</string>
<string>_("Reset")</string>
</property>
</widget>
</item>
<item row="3" column="2" >
<widget class="QPushButton" name="filtersUpdateButton" >
<property name="text" >
<string>Update</string>
<string>_("Update")</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_33" >
<property name="text" >
<string>Video filters</string>
<string>_("Video filters")</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_32" >
<property name="text" >
<string>Vout filters</string>
<string>_("Vout filters")</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_34" >
<property name="text" >
<string>Subpicture filters</string>
<string>_("Subpicture filters")</string>
</property>
</widget>
</item>
......@@ -179,7 +179,7 @@
<item rowspan="4" row="5" column="3" >
<widget class="QGroupBox" name="eraseEnable" >
<property name="title" >
<string>Logo erase</string>
<string>_("Logo erase")</string>
</property>
<property name="checkable" >
<bool>true</bool>
......@@ -197,14 +197,14 @@
<item row="1" column="0" >
<widget class="QLabel" name="label_16" >
<property name="text" >
<string>Top</string>
<string>_("Top")</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_17" >
<property name="text" >
<string>Left</string>
<string>_("Left")</string>
</property>