Skip to content

V
vlc-2-2
Commit d95a9919 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ALL: slightly changed some interface strings so that they are common to 

    all GUIs, thus making the translators' work easier.
parent 9cc29784
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2281 additions and 3640 deletions
modules/codec/mpeg_video/headers.c
View file @ d95a9919
......@@ -2,7 +2,7 @@
* vpar_headers.c : headers parsing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: headers.c,v 1.6 2002/11/28 17:35:00 sam Exp $
* $Id: headers.c,v 1.7 2003/01/15 13:16:39 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......@@ -1092,6 +1092,7 @@ static void PictureDisplayExtension( vpar_thread_t * p_vpar )
int i_nb, i_dummy;
/* I am not sure it works but it should
(fewer tests than shown in 6.3.12) */
/* FIXME: is VLC_TRUE always 1 ? */
i_nb = p_vpar->sequence.b_progressive ? p_vpar->sequence.b_progressive +
p_vpar->picture.b_repeat_first_field +
p_vpar->picture.b_top_field_first
......
modules/gui/gtk/gnome.glade
View file @ d95a9919
......@@ -1317,11 +1317,11 @@
<class>GnomeAbout</class>
<name>intf_about</name>
<modal>False</modal>
<copyright>(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team</copyright>
<copyright>(C) 1996-2003 - the VideoLAN Team</copyright>
<authors>the VideoLAN team &lt;videolan@videolan.org&gt;
http://www.videolan.org/
</authors>
<comments>This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source.</comments>
<comments>This is the VideoLAN Client, a DVD, MPEG and DivX player. It can play MPEG and MPEG2 files from a file or from a network source.</comments>
</widget>
<widget>
......@@ -1979,7 +1979,7 @@ http://www.videolan.org/
<handler>GtkNetworkOpenChannel</handler>
<last_modification_time>Thu, 16 May 2002 01:44:15 GMT</last_modification_time>
</signal>
<label>Channel server </label>
<label>Channel server</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
......
modules/gui/gtk/gnome_interface.c
View file @ d95a9919
......@@ -1125,9 +1125,9 @@ create_intf_about (void)
GtkWidget *intf_about;
intf_about = gnome_about_new ("VideoLAN Client", VERSION,
_("(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team"),
_("(C) 1996-2003 - the VideoLAN Team"),
authors,
_("This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source."),
_("This is the VideoLAN Client, a DVD, MPEG and DivX player. It can play MPEG and MPEG2 files from a file or from a network source."),
NULL);
gtk_object_set_data (GTK_OBJECT (intf_about), "intf_about", intf_about);
......@@ -1472,7 +1472,7 @@ create_intf_open (void)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
network_channel = gtk_radio_button_new_with_label (table4_group, _("Channel server "));
network_channel = gtk_radio_button_new_with_label (table4_group, _("Channel server"));
table4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_channel));
gtk_widget_ref (network_channel);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "network_channel", network_channel,
......
modules/gui/gtk/gtk.glade
View file @ d95a9919
......@@ -1378,7 +1378,7 @@
<widget>
<class>GtkLabel</class>
<name>label18</name>
<label>(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team</label>
<label>(C) 1996-2003 - the VideoLAN Team</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -1421,7 +1421,7 @@ http://www.videolan.org/</label>
<widget>
<class>GtkLabel</class>
<name>label17</name>
<label>This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source.</label>
<label>This is the VideoLAN Client, a DVD, MPEG and DivX player. It can play MPEG and MPEG2 files from a file or from a network source.</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>True</wrap>
<xalign>0.5</xalign>
......@@ -2129,7 +2129,7 @@ http://www.videolan.org/</label>
<handler>GtkNetworkOpenChannel</handler>
<last_modification_time>Thu, 16 May 2002 01:44:15 GMT</last_modification_time>
</signal>
<label>Channel server </label>
<label>Channel server</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
......
modules/gui/gtk/gtk_interface.c
View file @ d95a9919
......@@ -1361,7 +1361,7 @@ create_intf_about (void)
gtk_box_pack_start (GTK_BOX (vbox3), label14, TRUE, TRUE, 0);
gtk_misc_set_padding (GTK_MISC (label14), 0, 10);
label18 = gtk_label_new (_("(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team"));
label18 = gtk_label_new (_("(C) 1996-2003 - the VideoLAN Team"));
gtk_widget_ref (label18);
gtk_object_set_data_full (GTK_OBJECT (intf_about), "label18", label18,
(GtkDestroyNotify) gtk_widget_unref);
......@@ -1387,7 +1387,7 @@ create_intf_about (void)
gtk_misc_set_alignment (GTK_MISC (label16), 0.5, 0);
gtk_misc_set_padding (GTK_MISC (label16), 5, 5);
label17 = gtk_label_new (_("This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source."));
label17 = gtk_label_new (_("This is the VideoLAN Client, a DVD, MPEG and DivX player. It can play MPEG and MPEG2 files from a file or from a network source."));
gtk_widget_ref (label17);
gtk_object_set_data_full (GTK_OBJECT (intf_about), "label17", label17,
(GtkDestroyNotify) gtk_widget_unref);
......@@ -1760,7 +1760,7 @@ create_intf_open (void)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
network_channel = gtk_radio_button_new_with_label (table4_group, _("Channel server "));
network_channel = gtk_radio_button_new_with_label (table4_group, _("Channel server"));
table4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_channel));
gtk_widget_ref (network_channel);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "network_channel", network_channel,
......
modules/gui/kde/kde.cpp
View file @ d95a9919
......@@ -2,7 +2,7 @@
* kde.cpp : KDE plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: kde.cpp,v 1.4 2002/10/27 23:10:19 sigmunau Exp $
* $Id: kde.cpp,v 1.5 2003/01/15 13:16:39 sam Exp $
*
* Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
*
......@@ -110,10 +110,10 @@ void run(intf_thread_t *p_intf)
{
p_intf->p_sys->p_about =
new KAboutData( "VideoLAN Client", I18N_NOOP("Kvlc"), VERSION,
_("This is the VideoLAN client, a DVD and MPEG player. It can play "
"MPEG and MPEG 2 files from a file or from a network source."),
_("This is the VideoLAN Client, a DVD, MPEG and DivX player. It can "
"play MPEG and MPEG2 files from a file or from a network source."),
KAboutData::License_GPL,
_("(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team"),
_("(C) 1996-2003 - the VideoLAN Team"),
0, 0, "");
p_intf->p_sys->p_about->addAuthor( "the VideoLAN Team", 0,
......
modules/gui/win32/Modules.am
View file @ d95a9919
......@@ -48,5 +48,8 @@ BORLAND_win32 = \
modules/gui/win32/playlist.h \
modules/gui/win32/preferences.h \
modules/gui/win32/win32_common.h \
modules/gui/win32/misc.h
modules/gui/win32/misc.h \
\
modules/gui/win32/strings.cpp \
$(NULL)
modules/gui/win32/about.dfm
View file @ d95a9919
......@@ -265,7 +265,7 @@ object AboutDlg: TAboutDlg
Top = 64
Width = 267
Height = 13
Caption = '(C) Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002'
Caption = '(C) 1996-2003 - the VideoLAN Team'
end
object Label4: TLabel
Tag = 3
......@@ -275,8 +275,7 @@ object AboutDlg: TAboutDlg
Height = 39
Caption =
'This is the VideoLAN Client, a DVD, MPEG and DivX player. It can' +
' play MPEG and MPEG 2 files from a file or from a network source' +
'.'
' play MPEG and MPEG2 files from a file or from a network source.'
WordWrap = True
end
object Label3: TLabel
......
modules/gui/win32/mainframe.dfm
View file @ d95a9919
......@@ -4,7 +4,7 @@ object MainFrameDlg: TMainFrameDlg
Width = 541
Height = 306
BorderIcons = [biSystemMenu, biMinimize]
Caption = 'VideoLAN Client (win32 interface)'
Caption = 'VideoLAN Client'
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
......@@ -306,7 +306,7 @@ object MainFrameDlg: TMainFrameDlg
Top = 16
Width = 49
Height = 13
Caption = 'No server!'
Caption = 'No server'
end
object ButtonGo: TButton
Tag = 3
......@@ -539,19 +539,19 @@ object MainFrameDlg: TMainFrameDlg
Tag = 3
Caption = '&Program'
Enabled = False
Hint = 'Select program'
Hint = 'Choose the program'
end
object MenuTitle: TMenuItem
Tag = 3
Caption = '&Title'
Enabled = False
Hint = 'Select title'
Hint = 'Choose title'
end
object MenuChapter: TMenuItem
Tag = 3
Caption = '&Chapter'
Enabled = False
Hint = 'Select chapter'
Hint = 'Choose chapter'
end
object MenuAngle: TMenuItem
Tag = 3
......@@ -563,13 +563,13 @@ object MainFrameDlg: TMainFrameDlg
Tag = 3
Caption = '&Language'
Enabled = False
Hint = 'Select audio language'
Hint = 'Select audio channel'
end
object MenuSubtitles: TMenuItem
Tag = 3
Caption = '&Subtitles'
Enabled = False
Hint = 'Select subtitles language'
Hint = 'Select subtitles channel'
end
end
object MenuHelp: TMenuItem
......@@ -2336,7 +2336,7 @@ object MainFrameDlg: TMainFrameDlg
end
object Control1: TMenuItem
Tag = 3
Caption = 'Control'
Caption = 'Controls'
object PopupBack: TMenuItem
Tag = 3
Action = BackAction
......@@ -2606,7 +2606,7 @@ object MainFrameDlg: TMainFrameDlg
Tag = 3
Category = 'Control'
Caption = '&Fullscreen'
Hint = 'Toggle fullscreen'
Hint = 'Toggle fullscreen mode'
ShortCut = 70
OnExecute = FullscreenActionExecute
end
......@@ -2636,28 +2636,28 @@ object MainFrameDlg: TMainFrameDlg
Tag = 3
Category = 'Control'
Caption = 'Prev'
Hint = 'Jump to previous title'
Hint = 'Select previous title'
OnExecute = PrevTitleActionExecute
end
object NextTitleAction: TAction
Tag = 3
Category = 'Control'
Caption = 'Next'
Hint = 'Jump to next title'
Hint = 'Select next title'
OnExecute = NextTitleActionExecute
end
object PrevChapterAction: TAction
Tag = 3
Category = 'Control'
Caption = 'Prev'
Hint = 'Jump to previous chapter'
Hint = 'Select previous chapter'
OnExecute = PrevChapterActionExecute
end
object NextChapterAction: TAction
Tag = 3
Category = 'Control'
Caption = 'Next'
Hint = 'Jump to next chapter'
Hint = 'Select next chapter'
OnExecute = NextChapterActionExecute
end
object VolumeUpAction: TAction
......
modules/gui/win32/network.dfm
View file @ d95a9919
......@@ -356,7 +356,7 @@ object NetworkDlg: TNetworkDlg
Top = 80
Width = 113
Height = 17
Caption = 'Channel Server'
Caption = 'Channel server'
TabOrder = 2
OnEnter = RadioButtonCSEnter
end
......
modules/gui/win32/strings.cpp
View file @ d95a9919
......@@ -3,8 +3,8 @@
/* from modules/gui/win32/about.dfm: */
Caption = _( "About" );
Caption = _( "VideoLAN Client" );
Caption = _( "(C) Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002" );
Caption = _( "This is the VideoLAN Client, a DVD, MPEG and DivX player. It can" " play MPEG and MPEG 2 files from a file or from a network source" "." );
Caption = _( "(C) 1996-2003 - the VideoLAN Team" );
Caption = _( "This is the VideoLAN Client, a DVD, MPEG and DivX player. It can" " play MPEG and MPEG2 files from a file or from a network source." );
Caption = _( "The VideoLAN Team <videolan@videolan.org>" );
Caption = _( "http://www.videolan.org/" );
Caption = _( "Version x.y.z" );
......@@ -23,74 +23,62 @@
Text = _( "F:\\" );
/* from modules/gui/win32/mainframe.dfm: */
Caption = _( "VideoLAN Client (win32 interface)" );
Caption = _( "VideoLAN Client" );
Caption = _( "ToolBar" );
Caption = _( "ToolButtonSep1" );
Caption = _( "ToolButton1" );
Caption = _( "ToolButtonSep2" );
Caption = _( "File read" );
Caption = _( "Channel:" );
Caption = _( "No server!" );
Caption = _( "No server" );
Caption = _( "Go!" );
Caption = _( "Disc" );
Caption = _( "Title:" );
Caption = _( "Chapter:" );
Caption = _( "---" );
Caption = _( "---" );
Caption = _( "0:00:00" );
Caption = _( "&File" );
Caption = _( "Open &file..." );
Caption = _( "Open &disc..." );
Caption = _( "&Network stream..." );
Caption = _( "-" );
Caption = _( "&View" );
Caption = _( "&Hide interface" );
Hint = _( "Hide the main interface window" );
Caption = _( "-" );
Caption = _( "&Playlist..." );
Caption = _( "&Controls" );
Caption = _( "Audio device" );
Caption = _( "C&hannels" );
Hint = _( "Select audio channel" );
Caption = _( "-" );
Caption = _( "Sc&reen" );
Caption = _( "-" );
Caption = _( "&Program" );
Hint = _( "Select program" );
Hint = _( "Choose the program" );
Caption = _( "&Title" );
Hint = _( "Select title" );
Hint = _( "Choose title" );
Caption = _( "&Chapter" );
Hint = _( "Select chapter" );
Hint = _( "Choose chapter" );
Caption = _( "&Angle" );
Hint = _( "Select angle" );
Caption = _( "&Language" );
Hint = _( "Select audio language" );
Hint = _( "Select audio channel" );
Caption = _( "&Subtitles" );
Hint = _( "Select subtitles language" );
Hint = _( "Select subtitles channel" );
Caption = _( "&Help" );
Caption = _( "Close this popup" );
Caption = _( "Show interface" );
Caption = _( "-" );
Caption = _( "Control" );
Caption = _( "-" );
Caption = _( "Controls" );
Caption = _( "&Jump..." );
Caption = _( "-" );
Caption = _( "Audio settings" );
Caption = _( "Device" );
Caption = _( "Channels" );
Caption = _( "Screen" );
Caption = _( "-" );
Caption = _( "Navigation" );
Caption = _( "Program" );
Caption = _( "Language" );
Caption = _( "Subtitles" );
Caption = _( "-" );
Caption = _( "Playlist..." );
Caption = _( "New stream" );
Caption = _( "Open file..." );
Caption = _( "Open disc..." );
Caption = _( "Network stream..." );
Caption = _( "-" );
Caption = _( "File" );
Hint = _( "Open a file" );
Caption = _( "Disc" );
......@@ -119,7 +107,7 @@
Caption = _( "Exit" );
Hint = _( "Exit the program" );
Caption = _( "&Fullscreen" );
Hint = _( "Toggle fullscreen" );
Hint = _( "Toggle fullscreen mode" );
Caption = _( "Preferences..." );
Hint = _( "Configure the application" );
Caption = _( "Messages..." );
......@@ -127,13 +115,13 @@
Caption = _( "About..." );
Hint = _( "About this application" );
Caption = _( "Prev" );
Hint = _( "Jump to previous title" );
Hint = _( "Select previous title" );
Caption = _( "Next" );
Hint = _( "Jump to next title" );
Hint = _( "Select next title" );
Caption = _( "Prev" );
Hint = _( "Jump to previous chapter" );
Hint = _( "Select previous chapter" );
Caption = _( "Next" );
Hint = _( "Jump to next chapter" );
Hint = _( "Select next chapter" );
Caption = _( "Volume &Up" );
Hint = _( "Increase the volume" );
Caption = _( "Volume &Down" );
......@@ -156,7 +144,7 @@
Caption = _( "URL:" );
Caption = _( "UDP/RTP" );
Caption = _( "UDP/RTP Multicast" );
Caption = _( "Channel Server" );
Caption = _( "Channel server" );
Caption = _( "HTTP/FTP/MMS" );
Text = _( "vlcs" );
......@@ -173,10 +161,8 @@
Caption = _( "&Delete" );
Caption = _( "&Selection" );
Caption = _( "&Selection" );
Caption = _( "-" );
Caption = _( "&Invert selection" );
Caption = _( "&Crop selection" );
Caption = _( "-" );
Caption = _( "&Delete selection" );
Caption = _( "Delete &all" );
Caption = _( "Invert" );
......
modules/misc/gtk_main.c
View file @ d95a9919
......@@ -2,7 +2,7 @@
* gtk_main.c : Gtk+ wrapper for gtk_main
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: gtk_main.c,v 1.10 2002/10/15 08:35:24 sam Exp $
* $Id: gtk_main.c,v 1.11 2003/01/15 13:16:39 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......
modules/video_output/wingdi.c
View file @ d95a9919
......@@ -2,7 +2,7 @@
* wingdi.c : Win32 / WinCE GDI video output plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: wingdi.c,v 1.4 2002/11/23 02:40:30 sam Exp $
* $Id: wingdi.c,v 1.5 2003/01/15 13:16:39 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -46,7 +46,7 @@ static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * );
static void Render ( vout_thread_t *, picture_t * );
static void Display ( vout_thread_t *, picture_t * );
static void SetPalette( vout_thread_t *, u16 *, u16 *, u16 * );
static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
static void EventThread ( vlc_object_t * );
static long FAR PASCAL WndProc ( HWND, UINT, WPARAM, LPARAM );
......@@ -288,7 +288,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
/*****************************************************************************
* SetPalette: sets an 8 bpp palette
*****************************************************************************/
static void SetPalette( vout_thread_t *p_vout, u16 *red, u16 *green, u16 *blue )
static void SetPalette( vout_thread_t *p_vout,
uint16_t *red, uint16_t *green, uint16_t *blue )
{
msg_Err( p_vout, "FIXME: SetPalette unimplemented" );
}
......
po/de.po
View file @ d95a9919
This diff is collapsed.
po/en_GB.po
View file @ d95a9919
This diff is collapsed.
po/fr.po
View file @ d95a9919
This diff is collapsed.
po/it.po
View file @ d95a9919
This diff is collapsed.
po/ja.po
View file @ d95a9919
This diff is collapsed.
po/nl.po
View file @ d95a9919
This diff is collapsed.
po/no.po
View file @ d95a9919
This diff is collapsed.
po/pl.po
View file @ d95a9919
This diff is collapsed.
po/ru.po
View file @ d95a9919
This diff is collapsed.
po/se.po
View file @ d95a9919
This diff is collapsed.
po/vlc.pot
View file @ d95a9919
This diff is collapsed.
src/video_output/vout_pictures.c
View file @ d95a9919
......@@ -2,7 +2,7 @@
* vout_pictures.c : picture management functions
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: vout_pictures.c,v 1.32 2002/11/20 13:37:36 sam Exp $
* $Id: vout_pictures.c,v 1.33 2003/01/15 13:16:40 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -661,7 +661,8 @@ static void CopyPicture( vout_thread_t * p_vout,
else
{
/* We need to proceed line by line */
u8 *p_in = p_src->p[i].p_pixels, *p_out = p_dest->p[i].p_pixels;
uint8_t *p_in = p_src->p[i].p_pixels;
uint8_t *p_out = p_dest->p[i].p_pixels;
int i_line;
for( i_line = p_src->p[i].i_lines; i_line--; )
......
toolbox
View file @ d95a9919
#! /bin/sh
## toolbox for vlc, the VideoLAN Client
## $Id: toolbox,v 1.2 2003/01/13 15:20:24 sam Exp $
## $Id: toolbox,v 1.3 2003/01/15 13:16:39 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -276,7 +276,7 @@ then
find modules/gui/win32 -name '*.dfm' | while read file
do
printf "\n/* from $file: */\n" >> modules/gui/win32/strings.cpp
perl -ne 'chop; chop; if( $_ =~ / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file >> modules/gui/win32/strings.cpp || exit 1
perl -ne 'chop; chop; if( $_ =~ / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file | grep -v '"-*"' >> modules/gui/win32/strings.cpp || exit 1
done
# clean old potfiles
cd po
......
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