Commit d0bff31c authored by Sam Hocevar's avatar Sam Hocevar

* ./po/*: more interface strings harmonization.

parent 9284620b
......@@ -500,23 +500,6 @@ rtp6://:1234
<build_insensitive>True</build_insensitive>
</widget>
<widget>
<class>GtkLabel</class>
<name>labelVlc</name>
<x>64</x>
<y>8</y>
<width>120</width>
<height>40</height>
<label>VideoLAN Client
for familiar Linux</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>True</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<name>labelCopyright</name>
......@@ -524,7 +507,7 @@ rtp6://:1234
<y>56</y>
<width>200</width>
<height>18</height>
<label>(c) 2002, the VideoLAN Team</label>
<label>(c) 1996-2003 the VideoLAN team</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -564,6 +547,22 @@ rtp6://:1234
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<name>labelVlc</name>
<x>64</x>
<y>8</y>
<width>120</width>
<height>40</height>
<label>VLC media player</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>True</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
</widget>
<widget>
......
......@@ -53,10 +53,10 @@ create_familiar (void)
GtkWidget *preferences;
GtkWidget *fixedAbout;
GtkWidget *logo;
GtkWidget *labelVlc;
GtkWidget *labelCopyright;
GtkWidget *labelAuthors;
GtkWidget *labelAbout;
GtkWidget *labelVlc;
GtkWidget *about;
familiar = gtk_window_new (GTK_WINDOW_TOPLEVEL);
......@@ -412,18 +412,7 @@ create_familiar (void)
gtk_widget_set_uposition (logo, 8, 0);
gtk_widget_set_usize (logo, 50, 50);
labelVlc = gtk_label_new (_("VideoLAN Client\n for familiar Linux"));
gtk_widget_set_name (labelVlc, "labelVlc");
gtk_widget_ref (labelVlc);
gtk_object_set_data_full (GTK_OBJECT (familiar), "labelVlc", labelVlc,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (labelVlc);
gtk_fixed_put (GTK_FIXED (fixedAbout), labelVlc, 64, 8);
gtk_widget_set_uposition (labelVlc, 64, 8);
gtk_widget_set_usize (labelVlc, 120, 40);
gtk_label_set_line_wrap (GTK_LABEL (labelVlc), TRUE);
labelCopyright = gtk_label_new (_("(c) 2002, the VideoLAN Team"));
labelCopyright = gtk_label_new (_("(c) 1996-2003 the VideoLAN team"));
gtk_widget_set_name (labelCopyright, "labelCopyright");
gtk_widget_ref (labelCopyright);
gtk_object_set_data_full (GTK_OBJECT (familiar), "labelCopyright", labelCopyright,
......@@ -456,6 +445,17 @@ create_familiar (void)
gtk_label_set_justify (GTK_LABEL (labelAbout), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (labelAbout), TRUE);
labelVlc = gtk_label_new (_("VLC media player"));
gtk_widget_set_name (labelVlc, "labelVlc");
gtk_widget_ref (labelVlc);
gtk_object_set_data_full (GTK_OBJECT (familiar), "labelVlc", labelVlc,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (labelVlc);
gtk_fixed_put (GTK_FIXED (fixedAbout), labelVlc, 64, 8);
gtk_widget_set_uposition (labelVlc, 64, 8);
gtk_widget_set_usize (labelVlc, 120, 40);
gtk_label_set_line_wrap (GTK_LABEL (labelVlc), TRUE);
about = gtk_label_new (_("About"));
gtk_widget_set_name (about, "about");
gtk_widget_ref (about);
......
......@@ -34,7 +34,7 @@
<handler>GtkWindowDrag</handler>
<last_modification_time>Sat, 19 May 2001 02:30:24 GMT</last_modification_time>
</signal>
<title>VideoLAN Client</title>
<title>VLC media player</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
......@@ -1535,7 +1535,7 @@
<class>GnomeAbout</class>
<name>intf_about</name>
<modal>False</modal>
<copyright>(C) 1996-2003 - 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>
......
......@@ -276,7 +276,7 @@ create_intf_window (void)
tooltips = gtk_tooltips_new ();
intf_window = gnome_app_new ("VideoLAN Client", _("VideoLAN Client"));
intf_window = gnome_app_new ("VideoLAN Client", _("VLC media player"));
gtk_object_set_data (GTK_OBJECT (intf_window), "intf_window", intf_window);
gtk_window_set_policy (GTK_WINDOW (intf_window), FALSE, TRUE, TRUE);
......@@ -1399,7 +1399,7 @@ create_intf_about (void)
GtkWidget *intf_about;
intf_about = gnome_about_new ("VideoLAN Client", VERSION,
_("(C) 1996-2003 - the VideoLAN Team"),
_("(c) 1996-2003 the VideoLAN team"),
authors,
_("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);
......
......@@ -33,7 +33,7 @@
<handler>GtkWindowDelete</handler>
<last_modification_time>Tue, 09 Jul 2002 09:09:53 GMT</last_modification_time>
</signal>
<title>VideoLAN Client</title>
<title>VLC media player</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
......@@ -1585,7 +1585,7 @@
<widget>
<class>GtkLabel</class>
<name>label14</name>
<label>VideoLAN Client</label>
<label>VLC media player</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -1602,7 +1602,7 @@
<widget>
<class>GtkLabel</class>
<name>label18</name>
<label>(C) 1996-2003 - the VideoLAN Team</label>
<label>(c) 1996-2003 the VideoLAN team</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -1629,16 +1629,44 @@
</child>
<widget>
<class>GtkLabel</class>
<name>label16</name>
<label>the VideoLAN team &lt;videolan@videolan.org&gt;
http://www.videolan.org/</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0</yalign>
<xpad>5</xpad>
<ypad>5</ypad>
<class>GtkVBox</class>
<name>vbox17</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkLabel</class>
<name>label16</name>
<label>the VideoLAN team &lt;videolan@videolan.org&gt;</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0</yalign>
<xpad>5</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label39</name>
<label>http://www.videolan.org/</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0</yalign>
<xpad>5</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
......
......@@ -123,7 +123,7 @@ create_intf_window (void)
intf_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_object_set_data (GTK_OBJECT (intf_window), "intf_window", intf_window);
gtk_window_set_title (GTK_WINDOW (intf_window), _("VideoLAN Client"));
gtk_window_set_title (GTK_WINDOW (intf_window), _("VLC media player"));
gtk_window_set_policy (GTK_WINDOW (intf_window), TRUE, TRUE, TRUE);
window_vbox = gtk_vbox_new (FALSE, 0);
......@@ -1608,7 +1608,9 @@ create_intf_about (void)
GtkWidget *label14;
GtkWidget *label18;
GtkWidget *frame1;
GtkWidget *vbox17;
GtkWidget *label16;
GtkWidget *label39;
GtkWidget *label17;
GtkWidget *dialog_action_area;
GtkWidget *about_ok;
......@@ -1631,7 +1633,7 @@ create_intf_about (void)
gtk_widget_show (vbox3);
gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox3, TRUE, TRUE, 0);
label14 = gtk_label_new (_("VideoLAN Client"));
label14 = gtk_label_new (_("VLC media player"));
gtk_widget_ref (label14);
gtk_object_set_data_full (GTK_OBJECT (intf_about), "label14", label14,
(GtkDestroyNotify) gtk_widget_unref);
......@@ -1639,7 +1641,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-2003 - 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);
......@@ -1655,15 +1657,32 @@ create_intf_about (void)
gtk_widget_show (frame1);
gtk_box_pack_start (GTK_BOX (vbox3), frame1, FALSE, FALSE, 0);
label16 = gtk_label_new (_("the VideoLAN team <videolan@videolan.org>\nhttp://www.videolan.org/"));
vbox17 = gtk_vbox_new (FALSE, 0);
gtk_widget_ref (vbox17);
gtk_object_set_data_full (GTK_OBJECT (intf_about), "vbox17", vbox17,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (vbox17);
gtk_container_add (GTK_CONTAINER (frame1), vbox17);
label16 = gtk_label_new (_("the VideoLAN team <videolan@videolan.org>"));
gtk_widget_ref (label16);
gtk_object_set_data_full (GTK_OBJECT (intf_about), "label16", label16,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label16);
gtk_container_add (GTK_CONTAINER (frame1), label16);
gtk_box_pack_start (GTK_BOX (vbox17), label16, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label16), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label16), 0.5, 0);
gtk_misc_set_padding (GTK_MISC (label16), 5, 5);
gtk_misc_set_padding (GTK_MISC (label16), 5, 0);
label39 = gtk_label_new ("http://www.videolan.org/");
gtk_widget_ref (label39);
gtk_object_set_data_full (GTK_OBJECT (intf_about), "label39", label39,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label39);
gtk_box_pack_start (GTK_BOX (vbox17), label39, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label39), 0.5, 0);
gtk_misc_set_padding (GTK_MISC (label39), 5, 0);
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);
......
......@@ -2,7 +2,7 @@
* kde.cpp : KDE plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: kde.cpp,v 1.7 2003/01/28 22:03:21 sam Exp $
* $Id: kde.cpp,v 1.8 2003/02/02 01:37:03 sam Exp $
*
* Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
*
......@@ -108,10 +108,10 @@ void run(intf_thread_t *p_intf)
_("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-2003 - the VideoLAN Team"),
_("(c) 1996-2003 the VideoLAN team"),
0, 0, "");
p_intf->p_sys->p_about->addAuthor( "the VideoLAN Team", 0,
p_intf->p_sys->p_about->addAuthor( "the VideoLAN team", 0,
"<videolan@videolan.org>" );
int argc = 1;
......
......@@ -252,7 +252,7 @@ object AboutDlg: TAboutDlg
Top = 18
Width = 132
Height = 20
Caption = 'VideoLAN Client'
Caption = 'VLC media player'
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -16
......@@ -266,7 +266,7 @@ object AboutDlg: TAboutDlg
Top = 64
Width = 172
Height = 13
Caption = '(C) 1996-2003 - the VideoLAN Team'
Caption = '(c) 1996-2003 the VideoLAN team'
end
object Label4: TLabel
Tag = 3
......@@ -285,7 +285,7 @@ object AboutDlg: TAboutDlg
Top = 80
Width = 227
Height = 13
Caption = 'The VideoLAN Team <videolan@videolan.org>'
Caption = 'the VideoLAN Team <videolan@videolan.org>'
end
object Image1: TImage
Left = 32
......
......@@ -5,7 +5,7 @@ object MainFrameDlg: TMainFrameDlg
Width = 541
Height = 306
BorderIcons = [biSystemMenu, biMinimize]
Caption = 'VideoLAN Client'
Caption = 'VLC media player'
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
......
......@@ -5,11 +5,10 @@
*/
Caption = _( "About" );
Caption = _( "VideoLAN Client" );
Caption = _( "(C) 1996-2003 - the VideoLAN Team" );
Caption = _( "VLC media player" );
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 = _( "the VideoLAN Team <videolan@videolan.org>" );
Caption = _( "Version x.y.z" );
Caption = _( "OK" );
......@@ -32,7 +31,7 @@
* from modules/gui/win32/mainframe.dfm:
*/
Caption = _( "VideoLAN Client" );
Caption = _( "VLC media player" );
Caption = _( "ToolBar" );
Caption = _( "ToolButtonSep1" );
Caption = _( "ToolButtonSep2" );
......@@ -170,7 +169,6 @@
Caption = _( "UDP/RTP Multicast" );
Caption = _( "Channel server" );
Caption = _( "HTTP/FTP/MMS" );
Text = _( "vlcs" );
Caption = _( "OK" );
Caption = _( "Cancel" );
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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