configure: Set the proper werror variable when creating vlc-config.in

[vlc] / modules / gui / pda / pda_interface.c

diff --git a/modules/gui/pda/pda_interface.c b/modules/gui/pda/pda_interface.c
index 0ab64d9007c4def36f340cacb1aeb0c96104be63..b847b87bcb7c20e8253dd3b054a3ad12a4bbe24b 100644 (file)
--- a/modules/gui/pda/pda_interface.c
+++ b/modules/gui/pda/pda_interface.c
@@ -1,12 +1,14 @@
-/* This file was created automatically by glade2 and fixed by bootstrap */
+/*
+ * DO NOT EDIT THIS FILE - it is generated by Glade.
+ */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <string.h>
-#include <stdio.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -69,6 +71,8 @@ create_pda (void)
   GList *comboNetworkProtocolType_items = NULL;
   GtkWidget *entryNetworkProtocolType;
   GtkWidget *labelNetworkProtocol;
+  GtkWidget *labelNetworkTranscode;
+  GtkWidget *checkNetworkTranscode;
   GtkWidget *hbox13;
   GtkWidget *AddNetworkPlaylist;
   GtkWidget *Network;
@@ -116,6 +120,8 @@ create_pda (void)
   GtkWidget *checkV4LMJPEG;
   GtkObject *entryV4LDecimation_adj;
   GtkWidget *entryV4LDecimation;
+  GtkWidget *labelV4LTranscode;
+  GtkWidget *checkV4LTranscode;
   GtkWidget *hbox16;
   GtkWidget *AddCameraToPlaylist;
   GtkWidget *Camera;
@@ -158,7 +164,6 @@ create_pda (void)
   GtkWidget *entryVideoBitrate;
   GtkWidget *labelAudioBitrate;
   GtkWidget *comboStdAccess;
-  GList *comboStdAccess_items = NULL;
   GtkWidget *entryStdAccess;
   GtkWidget *labelSAP;
   GtkWidget *checkSAP;
@@ -304,7 +309,6 @@ create_pda (void)
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
   gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), timeLabel, NULL, NULL);
-  gtk_label_set_justify (GTK_LABEL (timeLabel), GTK_JUSTIFY_CENTER);
 
   timeSlider = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 6.25, 0)));
   gtk_widget_set_name (timeSlider, "timeSlider");
@@ -361,7 +365,6 @@ create_pda (void)
   gtk_widget_set_name (File, "File");
   gtk_widget_show (File);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), File);
-  gtk_label_set_justify (GTK_LABEL (File), GTK_JUSTIFY_CENTER);
 
   vbox5 = gtk_vbox_new (FALSE, 0);
   gtk_widget_set_name (vbox5, "vbox5");
@@ -376,12 +379,11 @@ create_pda (void)
   gtk_box_pack_start (GTK_BOX (vbox5), hbox12, FALSE, FALSE, 0);
   gtk_widget_set_size_request (hbox12, 247, 26);
 
-  labelNetworkMRL = gtk_label_new (_("MRL :"));
+  labelNetworkMRL = gtk_label_new (_("MRL:"));
   gtk_widget_set_name (labelNetworkMRL, "labelNetworkMRL");
   gtk_widget_show (labelNetworkMRL);
   gtk_box_pack_start (GTK_BOX (hbox12), labelNetworkMRL, FALSE, FALSE, 0);
   gtk_widget_set_size_request (labelNetworkMRL, 35, 16);
-  gtk_label_set_justify (GTK_LABEL (labelNetworkMRL), GTK_JUSTIFY_CENTER);
 
   comboMRL = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (comboMRL)->popwin),
@@ -409,7 +411,7 @@ create_pda (void)
   gtk_widget_set_name (hseparator15, "hseparator15");
   gtk_widget_show (hseparator15);
   gtk_box_pack_start (GTK_BOX (vbox5), hseparator15, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (hseparator15, -1, 10);
+  gtk_widget_set_size_request (hseparator15, -2, 10);
 
   table2 = gtk_table_new (6, 2, FALSE);
   gtk_widget_set_name (table2, "table2");
@@ -422,6 +424,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (table2), labelNetworkPort, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelNetworkPort), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelNetworkPort), 0, 0.5);
 
   labelNetworkAddress = gtk_label_new (_("Address:"));
@@ -430,6 +433,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (table2), labelNetworkAddress, 0, 1, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelNetworkAddress), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelNetworkAddress), 0, 0.5);
 
   entryNetworkPort_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10);
@@ -478,6 +482,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (table2), labelNetworkType, 0, 1, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelNetworkType), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelNetworkType), 0, 0.5);
 
   comboNetworkProtocolType = gtk_combo_new ();
@@ -509,8 +514,25 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (table2), labelNetworkProtocol, 0, 1, 3, 4,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelNetworkProtocol), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelNetworkProtocol), 0, 0.5);
 
+  labelNetworkTranscode = gtk_label_new (_("Transcode:"));
+  gtk_widget_set_name (labelNetworkTranscode, "labelNetworkTranscode");
+  gtk_widget_show (labelNetworkTranscode);
+  gtk_table_attach (GTK_TABLE (table2), labelNetworkTranscode, 0, 1, 4, 5,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelNetworkTranscode), GTK_JUSTIFY_LEFT);
+  gtk_misc_set_alignment (GTK_MISC (labelNetworkTranscode), 0, 0.5);
+
+  checkNetworkTranscode = gtk_check_button_new_with_mnemonic (_("enable"));
+  gtk_widget_set_name (checkNetworkTranscode, "checkNetworkTranscode");
+  gtk_widget_show (checkNetworkTranscode);
+  gtk_table_attach (GTK_TABLE (table2), checkNetworkTranscode, 1, 2, 4, 5,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+
   hbox13 = gtk_hbox_new (FALSE, 0);
   gtk_widget_set_name (hbox13, "hbox13");
   gtk_widget_show (hbox13);
@@ -525,7 +547,6 @@ create_pda (void)
   gtk_widget_set_name (Network, "Network");
   gtk_widget_show (Network);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), Network);
-  gtk_label_set_justify (GTK_LABEL (Network), GTK_JUSTIFY_CENTER);
 
   vbox7 = gtk_vbox_new (FALSE, 0);
   gtk_widget_set_name (vbox7, "vbox7");
@@ -544,7 +565,7 @@ create_pda (void)
   gtk_container_add (GTK_CONTAINER (scrolledV4Lwindow), viewportV4L);
   gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewportV4L), GTK_SHADOW_OUT);
 
-  tableV4L = gtk_table_new (12, 2, FALSE);
+  tableV4L = gtk_table_new (13, 2, FALSE);
   gtk_widget_set_name (tableV4L, "tableV4L");
   gtk_widget_show (tableV4L);
   gtk_container_add (GTK_CONTAINER (viewportV4L), tableV4L);
@@ -555,6 +576,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4lVideDevice, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4lVideDevice), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4lVideDevice), 0, 0.5);
 
   labelV4LAudioDevice = gtk_label_new (_("Audio:"));
@@ -563,6 +585,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LAudioDevice, 0, 1, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LAudioDevice), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LAudioDevice), 0, 0.5);
 
   labelV4LChannel = gtk_label_new (_("Channel:"));
@@ -571,6 +594,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LChannel, 0, 1, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LChannel), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LChannel), 0, 0.5);
 
   labelV4LNorm = gtk_label_new (_("Norm:"));
@@ -579,6 +603,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LNorm, 0, 1, 3, 4,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LNorm), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LNorm), 0, 0.5);
 
   labelV4LSize = gtk_label_new (_("Size:"));
@@ -587,6 +612,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSize, 0, 1, 4, 5,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LSize), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LSize), 0, 0.5);
 
   labelV4LFrequency = gtk_label_new (_("Frequency:"));
@@ -595,6 +621,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LFrequency, 0, 1, 5, 6,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LFrequency), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LFrequency), 0, 0.5);
 
   labelV4LSampleRate = gtk_label_new (_("Samplerate:"));
@@ -603,6 +630,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSampleRate, 0, 1, 6, 7,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LSampleRate), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LSampleRate), 0, 0.5);
 
   labelV4LQuality = gtk_label_new (_("Quality:"));
@@ -611,6 +639,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LQuality, 0, 1, 7, 8,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LQuality), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LQuality), 0, 0.5);
 
   labelV4LTuner = gtk_label_new (_("Tuner:"));
@@ -619,6 +648,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LTuner, 0, 1, 9, 10,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LTuner), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LTuner), 0, 0.5);
 
   labelV4LSoundDirection = gtk_label_new (_("Sound:"));
@@ -627,6 +657,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSoundDirection, 0, 1, 8, 9,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LSoundDirection), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LSoundDirection), 0, 0.5);
 
   labelV4LMJPEG = gtk_label_new (_("MJPEG:"));
@@ -635,6 +666,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LMJPEG, 0, 1, 10, 11,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LMJPEG), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LMJPEG), 0, 0.5);
 
   labelV4LDecimation = gtk_label_new (_("Decimation:"));
@@ -643,6 +675,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableV4L), labelV4LDecimation, 0, 1, 11, 12,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LDecimation), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelV4LDecimation), 0, 0.5);
 
   comboV4lVideoDevice = gtk_combo_new ();
@@ -810,6 +843,22 @@ create_pda (void)
                     (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
+  labelV4LTranscode = gtk_label_new (_("Transcode:"));
+  gtk_widget_set_name (labelV4LTranscode, "labelV4LTranscode");
+  gtk_widget_show (labelV4LTranscode);
+  gtk_table_attach (GTK_TABLE (tableV4L), labelV4LTranscode, 0, 1, 12, 13,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LTranscode), GTK_JUSTIFY_LEFT);
+  gtk_misc_set_alignment (GTK_MISC (labelV4LTranscode), 0, 0.5);
+
+  checkV4LTranscode = gtk_check_button_new_with_mnemonic (_("enable"));
+  gtk_widget_set_name (checkV4LTranscode, "checkV4LTranscode");
+  gtk_widget_show (checkV4LTranscode);
+  gtk_table_attach (GTK_TABLE (tableV4L), checkV4LTranscode, 1, 2, 12, 13,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+
   hbox16 = gtk_hbox_new (FALSE, 0);
   gtk_widget_set_name (hbox16, "hbox16");
   gtk_widget_show (hbox16);
@@ -824,6 +873,7 @@ create_pda (void)
   gtk_widget_set_name (Camera, "Camera");
   gtk_widget_show (Camera);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), Camera);
+  gtk_label_set_justify (GTK_LABEL (Camera), GTK_JUSTIFY_LEFT);
 
   vbox1 = gtk_vbox_new (FALSE, 0);
   gtk_widget_set_name (vbox1, "vbox1");
@@ -852,6 +902,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoCodec, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelVideoCodec), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelVideoCodec), 0, 0.5);
 
   comboVideoCodec = gtk_combo_new ();
@@ -867,7 +918,6 @@ create_pda (void)
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("mp2v"));
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("mp4v"));
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("H263"));
-  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("I263"));
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("WMV1"));
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("WMV2"));
   gtk_combo_set_popdown_strings (GTK_COMBO (comboVideoCodec), comboVideoCodec_items);
@@ -884,6 +934,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoBitrate, 0, 1, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelVideoBitrate), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelVideoBitrate), 0, 0.5);
 
   labelVideoBitrateTolerance = gtk_label_new (_("Bitrate Tolerance:"));
@@ -892,6 +943,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoBitrateTolerance, 0, 1, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelVideoBitrateTolerance), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelVideoBitrateTolerance), 0, 0.5);
 
   labelVideoKeyInterval = gtk_label_new (_("Keyframe Interval:"));
@@ -900,6 +952,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoKeyInterval, 0, 1, 3, 4,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelVideoKeyInterval), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelVideoKeyInterval), 0, 0.5);
 
   labelAudioCodec = gtk_label_new (_("Audio Codec:"));
@@ -908,6 +961,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelAudioCodec, 0, 1, 5, 6,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelAudioCodec), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelAudioCodec), 0, 0.5);
 
   labelVideoDeinterlace = gtk_label_new (_("Deinterlace:"));
@@ -916,6 +970,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoDeinterlace, 0, 1, 4, 5,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelVideoDeinterlace), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelVideoDeinterlace), 0, 0.5);
 
   labelStdAccess = gtk_label_new (_("Access:"));
@@ -924,6 +979,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelStdAccess, 0, 1, 7, 8,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelStdAccess), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelStdAccess), 0, 0.5);
 
   labelStdMuxer = gtk_label_new (_("Muxer:"));
@@ -932,6 +988,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelStdMuxer, 0, 1, 8, 9,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelStdMuxer), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelStdMuxer), 0, 0.5);
 
   labelStdUrl = gtk_label_new (_("URL:"));
@@ -940,6 +997,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelStdUrl, 0, 1, 9, 10,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelStdUrl), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelStdUrl), 0, 0.5);
 
   labelStdTimeToLive = gtk_label_new (_("Time To Live (TTL):"));
@@ -948,6 +1006,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelStdTimeToLive, 0, 1, 10, 11,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelStdTimeToLive), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelStdTimeToLive), 0, 0.5);
 
   entryStdTTL_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
@@ -986,14 +1045,14 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), comboStdMuxer, 1, 2, 8, 9,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ps"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ts"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mpeg1"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("avi"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ogg"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mp4"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mov"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("asf"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("PS"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("TS"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MPEG1"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("AVI"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("OGG"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MP4"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MOV"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ASF"));
   gtk_combo_set_popdown_strings (GTK_COMBO (comboStdMuxer), comboStdMuxer_items);
   g_list_free (comboStdMuxer_items);
 
@@ -1076,6 +1135,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelAudioBitrate, 0, 1, 6, 7,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelAudioBitrate), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelAudioBitrate), 0, 0.5);
 
   comboStdAccess = gtk_combo_new ();
@@ -1086,16 +1146,6 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), comboStdAccess, 1, 2, 7, 8,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  comboStdAccess_items = g_list_append (comboStdAccess_items, (gpointer) _("udp"));
-  comboStdAccess_items = g_list_append (comboStdAccess_items, (gpointer) _("display"));
-  comboStdAccess_items = g_list_append (comboStdAccess_items, (gpointer) _("file"));
-  comboStdAccess_items = g_list_append (comboStdAccess_items, (gpointer) _("http"));
-  comboStdAccess_items = g_list_append (comboStdAccess_items, (gpointer) _("mmsh"));
-  comboStdAccess_items = g_list_append (comboStdAccess_items, (gpointer) _("rtp"));
-  comboStdAccess_items = g_list_append (comboStdAccess_items, (gpointer) _("http"));
-  comboStdAccess_items = g_list_append (comboStdAccess_items, (gpointer) _("ftp"));
-  gtk_combo_set_popdown_strings (GTK_COMBO (comboStdAccess), comboStdAccess_items);
-  g_list_free (comboStdAccess_items);
 
   entryStdAccess = GTK_COMBO (comboStdAccess)->entry;
   gtk_widget_set_name (entryStdAccess, "entryStdAccess");
@@ -1108,6 +1158,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelSAP, 0, 1, 11, 12,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelSAP), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelSAP), 0, 0.5);
 
   checkSAP = gtk_check_button_new_with_mnemonic (_("enable"));
@@ -1130,6 +1181,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelSLP_, 0, 1, 12, 13,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelSLP_), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelSLP_), 0, 0.5);
 
   labelAnounceChannel = gtk_label_new (_("Announce Channel:"));
@@ -1138,6 +1190,7 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), labelAnounceChannel, 0, 1, 13, 14,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelAnounceChannel), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelAnounceChannel), 0, 0.5);
 
   comboAnnounceChannel = gtk_combo_new ();
@@ -1167,7 +1220,6 @@ create_pda (void)
   gtk_widget_set_name (Transcode, "Transcode");
   gtk_widget_show (Transcode);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 3), Transcode);
-  gtk_label_set_justify (GTK_LABEL (Transcode), GTK_JUSTIFY_CENTER);
 
   vbox4 = gtk_vbox_new (FALSE, 0);
   gtk_widget_set_name (vbox4, "vbox4");
@@ -1211,7 +1263,6 @@ create_pda (void)
   gtk_widget_set_name (playlist, "playlist");
   gtk_widget_show (playlist);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 4), playlist);
-  gtk_label_set_justify (GTK_LABEL (playlist), GTK_JUSTIFY_CENTER);
 
   vbox2 = gtk_vbox_new (FALSE, 0);
   gtk_widget_set_name (vbox2, "vbox2");
@@ -1253,7 +1304,6 @@ create_pda (void)
   gtk_widget_set_name (preferences, "preferences");
   gtk_widget_show (preferences);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 5), preferences);
-  gtk_label_set_justify (GTK_LABEL (preferences), GTK_JUSTIFY_CENTER);
 
   scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_set_name (scrolledwindow3, "scrolledwindow3");
@@ -1278,11 +1328,12 @@ create_pda (void)
   gtk_fixed_put (GTK_FIXED (fixed2), aboutImage, 0, 0);
   gtk_widget_set_size_request (aboutImage, 48, 48);
 
-  labelDescription = gtk_label_new (_("VLC Media Player is an MPEG, MPEG 2, MP3 and DivX player that accepts input from local or network sources and is licensed under the GPL (http://www.gnu.org/copyleft/gpl.html)."));
+  labelDescription = gtk_label_new (_("VLC media player is an MPEG, MPEG 2, MP3 and DivX player that accepts input from local or network sources and is licensed under the GPL (http://www.gnu.org/copyleft/gpl.html)."));
   gtk_widget_set_name (labelDescription, "labelDescription");
   gtk_widget_show (labelDescription);
   gtk_fixed_put (GTK_FIXED (fixed2), labelDescription, 16, 112);
   gtk_widget_set_size_request (labelDescription, 200, 112);
+  gtk_label_set_justify (GTK_LABEL (labelDescription), GTK_JUSTIFY_LEFT);
   gtk_label_set_line_wrap (GTK_LABEL (labelDescription), TRUE);
 
   labelAuthors = gtk_label_new (_("Authors: the VideoLAN Team, http://www.videolan.org/team/"));
@@ -1290,28 +1341,26 @@ create_pda (void)
   gtk_widget_show (labelAuthors);
   gtk_fixed_put (GTK_FIXED (fixed2), labelAuthors, 16, 72);
   gtk_widget_set_size_request (labelAuthors, 208, 32);
+  gtk_label_set_justify (GTK_LABEL (labelAuthors), GTK_JUSTIFY_LEFT);
   gtk_label_set_line_wrap (GTK_LABEL (labelAuthors), TRUE);
 
-  labelCopyright = gtk_label_new (_("(c) 1996-2003 the VideoLAN team"));
+  labelCopyright = gtk_label_new (_("(c) 1996-2004 the the VideoLAN team team"));
   gtk_widget_set_name (labelCopyright, "labelCopyright");
   gtk_widget_show (labelCopyright);
   gtk_fixed_put (GTK_FIXED (fixed2), labelCopyright, 16, 48);
   gtk_widget_set_size_request (labelCopyright, 208, 16);
-  gtk_label_set_justify (GTK_LABEL (labelCopyright), GTK_JUSTIFY_CENTER);
 
   labelProgramName = gtk_label_new (_("VLC media player"));
   gtk_widget_set_name (labelProgramName, "labelProgramName");
   gtk_widget_show (labelProgramName);
   gtk_fixed_put (GTK_FIXED (fixed2), labelProgramName, 48, 16);
   gtk_widget_set_size_request (labelProgramName, 152, 16);
-  gtk_label_set_justify (GTK_LABEL (labelProgramName), GTK_JUSTIFY_CENTER);
   gtk_label_set_line_wrap (GTK_LABEL (labelProgramName), TRUE);
 
   about = gtk_label_new (_("About"));
   gtk_widget_set_name (about, "about");
   gtk_widget_show (about);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 6), about);
-  gtk_label_set_justify (GTK_LABEL (about), GTK_JUSTIFY_CENTER);
 
   g_signal_connect ((gpointer) pda, "delete_event",
                     G_CALLBACK (onPDADeleteEvent),
@@ -1443,6 +1492,8 @@ create_pda (void)
   GLADE_HOOKUP_OBJECT (pda, comboNetworkProtocolType, "comboNetworkProtocolType");
   GLADE_HOOKUP_OBJECT (pda, entryNetworkProtocolType, "entryNetworkProtocolType");
   GLADE_HOOKUP_OBJECT (pda, labelNetworkProtocol, "labelNetworkProtocol");
+  GLADE_HOOKUP_OBJECT (pda, labelNetworkTranscode, "labelNetworkTranscode");
+  GLADE_HOOKUP_OBJECT (pda, checkNetworkTranscode, "checkNetworkTranscode");
   GLADE_HOOKUP_OBJECT (pda, hbox13, "hbox13");
   GLADE_HOOKUP_OBJECT (pda, AddNetworkPlaylist, "AddNetworkPlaylist");
   GLADE_HOOKUP_OBJECT (pda, Network, "Network");
@@ -1479,6 +1530,8 @@ create_pda (void)
   GLADE_HOOKUP_OBJECT (pda, entryV4LTuner, "entryV4LTuner");
   GLADE_HOOKUP_OBJECT (pda, checkV4LMJPEG, "checkV4LMJPEG");
   GLADE_HOOKUP_OBJECT (pda, entryV4LDecimation, "entryV4LDecimation");
+  GLADE_HOOKUP_OBJECT (pda, labelV4LTranscode, "labelV4LTranscode");
+  GLADE_HOOKUP_OBJECT (pda, checkV4LTranscode, "checkV4LTranscode");
   GLADE_HOOKUP_OBJECT (pda, hbox16, "hbox16");
   GLADE_HOOKUP_OBJECT (pda, AddCameraToPlaylist, "AddCameraToPlaylist");
   GLADE_HOOKUP_OBJECT (pda, Camera, "Camera");