diff -uNr gnome-media-0.25/ChangeLog gnome-media-0.27/ChangeLog --- gnome-media-0.25/ChangeLog Wed Jul 1 22:20:07 1998 +++ gnome-media-0.27/ChangeLog Fri Aug 14 12:48:04 1998 @@ -1,3 +1,7 @@ +1998-08-14 Federico Mena Quintero + + * configure.in: Bumped version number to 0.27. + 1998-07-02 Nuno Ferreira * configure.in (ALL_LINGUAS): Added `pt' for Portuguese translation. diff -uNr gnome-media-0.25/Makefile.am gnome-media-0.27/Makefile.am --- gnome-media-0.25/Makefile.am Thu May 14 15:00:21 1998 +++ gnome-media-0.27/Makefile.am Fri Aug 14 12:45:28 1998 @@ -1,8 +1,12 @@ SUBDIRS = po intl macros \ - @PROGRAMS_EXTACE@ \ @PROGRAMS_GMIX@ \ @PROGRAMS_GNOMOVISION@ \ @PROGRAMS_TCD@ +# +# broken with current esound +# @PROGRAMS_EXTACE@ + +EXTRA_DIST = gnome-media.spec ## to automatically rebuild aclocal.m4 if any of the macros in `macros/' change @MAINT@include macros/macros.dep diff -uNr gnome-media-0.25/Makefile.in gnome-media-0.27/Makefile.in --- gnome-media-0.25/Makefile.in Wed Aug 5 16:00:26 1998 +++ gnome-media-0.27/Makefile.in Fri Aug 14 14:29:38 1998 @@ -106,10 +106,14 @@ l = @l@ SUBDIRS = po intl macros \ - @PROGRAMS_EXTACE@ \ @PROGRAMS_GMIX@ \ @PROGRAMS_GNOMOVISION@ \ @PROGRAMS_TCD@ +# +# broken with current esound +# @PROGRAMS_EXTACE@ + +EXTRA_DIST = gnome-media.spec ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h diff -uNr gnome-media-0.25/configure gnome-media-0.27/configure --- gnome-media-0.25/configure Wed Aug 5 15:47:02 1998 +++ gnome-media-0.27/configure Fri Aug 14 12:48:21 1998 @@ -722,7 +722,7 @@ PACKAGE=gnome-media -VERSION=0.25 +VERSION=0.27 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff -uNr gnome-media-0.25/configure.in gnome-media-0.27/configure.in --- gnome-media-0.25/configure.in Wed Aug 5 15:45:52 1998 +++ gnome-media-0.27/configure.in Fri Aug 14 12:47:57 1998 @@ -1,7 +1,7 @@ AC_INIT(gmix) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gnome-media, 0.25) +AM_INIT_AUTOMAKE(gnome-media, 0.27) AM_MAINTAINER_MODE AM_ACLOCAL_INCLUDE(macros) diff -uNr gnome-media-0.25/gmix/Makefile.in gnome-media-0.27/gmix/Makefile.in --- gnome-media-0.25/gmix/Makefile.in Wed Aug 5 16:00:31 1998 +++ gnome-media-0.27/gmix/Makefile.in Fri Aug 14 14:29:42 1998 @@ -283,6 +283,7 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gmix.o: gmix.c ../config.h info: dvi: diff -uNr gnome-media-0.25/gnome-media.spec gnome-media-0.27/gnome-media.spec --- gnome-media-0.25/gnome-media.spec Wed Dec 31 19:00:00 1969 +++ gnome-media-0.27/gnome-media.spec Thu Jul 23 15:14:18 1998 @@ -0,0 +1,71 @@ +# Note that this is NOT a relocatable package +%define ver 0.20 +%define rel SNAP +%define prefix /usr + +Summary: GNOME media programs +Name: gnome-media +Version: %ver +Release: %rel +Copyright: LGPL +Group: X11/Libraries +Source: ftp://ftp.gnome.org/pub/gnome-media-%{ver}.tar.gz +BuildRoot: /tmp/gnome-media-root +Obsoletes: gnome +Packager: Marc Ewing +URL: http://www.gnome.org +Docdir: %{prefix}/doc + +# these needed for extace +Requires: gsl +Requires: esound + + +%description +GNOME media programs. + +GNOME is the GNU Network Object Model Environment. That's a fancy +name but really GNOME is a nice GUI desktop environment. It makes +using your computer easy, powerful, and easy to configure. + +%changelog + +* Mon Mar 16 1998 Marc Ewing + +- Integrate into gnome-media CVS source tree + +%prep +%setup + +%build +# Needed for snapshot releases. +if [ ! -f configure ]; then + CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix +else + CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix +fi + +if [ "$SMP" != "" ]; then + (make "MAKE=make -k -j $SMP"; exit 0) + make +else + make +fi + +%install +rm -rf $RPM_BUILD_ROOT + +make prefix=$RPM_BUILD_ROOT%{prefix} install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root) + +%doc AUTHORS COPYING ChangeLog NEWS README +%{prefix}/bin/* +%{prefix}/share/locale/*/*/* +%{prefix}/share/apps/* +%{prefix}/share/pixmaps/* + diff -uNr gnome-media-0.25/ltconfig gnome-media-0.27/ltconfig --- gnome-media-0.25/ltconfig Wed Aug 5 15:46:53 1998 +++ gnome-media-0.27/ltconfig Fri Aug 14 12:48:15 1998 @@ -705,14 +705,7 @@ # See if GNU ld supports shared libraries. if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - case "$host_os" in - linux-gnu*) - archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs $deplibs' - ;; - *) - archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' - ;; - esac + archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' runpath_var=LD_RUN_PATH hardcode_runpath_var=yes ld_shlibs=yes @@ -957,11 +950,11 @@ main(){nm_test_var='a';nm_test_func();return(0);} EOF -echo "$progname:960: checking if global_symbol_pipe works" >&5 -if { (eval echo $progname:961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then +echo "$progname:953: checking if global_symbol_pipe works" >&5 +if { (eval echo $progname:954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then # Now try to grab the symbols. nlist=conftest.nm - if { echo "$progname:964: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + if { echo "$progname:957: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -1019,7 +1012,7 @@ save_CFLAGS="$CFLAGS" LIBS='conftestm.o' CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo $progname:1015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 diff -uNr gnome-media-0.25/macros/ChangeLog gnome-media-0.27/macros/ChangeLog --- gnome-media-0.25/macros/ChangeLog Tue Aug 4 19:56:11 1998 +++ gnome-media-0.27/macros/ChangeLog Fri Aug 14 12:45:28 1998 @@ -1,3 +1,7 @@ +1998-08-06 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Added `freebsd' directory. + 1998-08-04 Raja R Harinath * gnome-x-checks.m4: Define USE_DEVGTK unconditionally to `true'. diff -uNr gnome-media-0.25/macros/gnome-libgtop-sysdeps.m4 gnome-media-0.27/macros/gnome-libgtop-sysdeps.m4 --- gnome-media-0.25/macros/gnome-libgtop-sysdeps.m4 Wed Jul 29 17:46:32 1998 +++ gnome-media-0.27/macros/gnome-libgtop-sysdeps.m4 Fri Aug 14 12:45:28 1998 @@ -83,6 +83,11 @@ libgtop_use_machine_h=yes libgtop_need_server=yes ;; + freebsd*) + libgtop_sysdeps_dir=freebsd + libgtop_use_machine_h=yes + libgtop_need_server=yes + ;; *) libgtop_sysdeps_dir=stub libgtop_use_machine_h=no diff -uNr gnome-media-0.25/macros/gnome-objc-checks.m4 gnome-media-0.27/macros/gnome-objc-checks.m4 --- gnome-media-0.25/macros/gnome-objc-checks.m4 Sat Jun 27 10:36:13 1998 +++ gnome-media-0.27/macros/gnome-objc-checks.m4 Fri Aug 14 12:45:28 1998 @@ -60,7 +60,7 @@ AC_MSG_RESULT(found) else AC_MSG_RESULT(not found) - AC_MSG_ERROR(Could not find the obGnomeConf.sh file that is generated by gnome-objc install) + AC_MSG_WARN(Could not find the obGnomeConf.sh file that is generated by gnome-objc install) fi AC_SUBST(OBGNOME_INCLUDEDIR) AC_SUBST(OBGNOME_LIBS) diff -uNr gnome-media-0.25/po/ChangeLog gnome-media-0.27/po/ChangeLog --- gnome-media-0.25/po/ChangeLog Sat May 9 14:49:09 1998 +++ gnome-media-0.27/po/ChangeLog Fri Aug 14 14:29:30 1998 @@ -1,3 +1,8 @@ +1998-08-14 Federico Mena Quintero + + * POTFILES.in: Removed gnomovision files from POTFILES.in since + they are not being distributed. + 1998-05-09 Marc Ewing * removed mail headers from ga.po diff -uNr gnome-media-0.25/po/POTFILES.in gnome-media-0.27/po/POTFILES.in --- gnome-media-0.25/po/POTFILES.in Thu Jul 16 09:01:45 1998 +++ gnome-media-0.27/po/POTFILES.in Fri Aug 14 14:29:16 1998 @@ -1,2 +1 @@ gmix/gmix.c -gnomovision/tvset.c Binary files gnome-media-0.25/po/de.gmo and gnome-media-0.27/po/de.gmo differ diff -uNr gnome-media-0.25/po/de.po gnome-media-0.27/po/de.po --- gnome-media-0.25/po/de.po Wed Aug 5 16:00:27 1998 +++ gnome-media-0.27/po/de.po Thu Jul 23 15:14:20 1998 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnome-media VERSION\n" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" +"POT-Creation-Date: 1998-02-19 10:59+0100\n" "PO-Revision-Date: 1998-02-19 11:33+0100\n" "Last-Translator: Carsten Schaar \n" "Language-Team: German \n" @@ -14,71 +14,24 @@ "Content-Type: text/plain; charset=iso-8559-1\n" "Content-Transfer-Encoding: 8bit\n" -#: gmix/gmix.c:76 -#, fuzzy -msgid "File/Exit" -msgstr "Beenden" - -#: gmix/gmix.c:76 gmix/gmix.c:79 -msgid "E" -msgstr "" - -#. no options, yet -#: gmix/gmix.c:79 -msgid "Edit/Options..." -msgstr "" - -#: gmix/gmix.c:81 -msgid "Help/About..." -msgstr "" - -#: gmix/gmix.c:81 -msgid "A" -msgstr "" - -#: gmix/gmix.c:86 -msgid "don't restore mixer-settings from configuration" -msgstr "" - -#: gmix/gmix.c:87 -msgid "initialise the mixer(s) from stored configuration and exit" -msgstr "" - -#: gmix/gmix.c:88 -msgid "don't save (modified) mixer-settings into configuration" -msgstr "" - -#: gmix/gmix.c:508 -msgid "GMIX 3.0" -msgstr "" - #. lock-button, only useful for stereo -#: gmix/gmix.c:576 +#: gmix/gmix.c:266 msgid "Lock" msgstr "Lock" -#: gmix/gmix.c:587 -msgid "Rec." -msgstr "" - -#: gmix/gmix.c:594 +#: gmix/gmix.c:275 msgid "Mute" msgstr "Stumm" -#: gmix/gmix.c:758 -msgid "GMIX - The Gnome Mixer" -msgstr "" +#: gmix/gmix.c:289 +msgid "rec-src" +msgstr "Aufnahmequelle" -#: gmix/gmix.c:761 -msgid "This is a mixer for OSS sound-devices." -msgstr "" - -#: gnomovision/tvset.c:1412 -msgid "FILE ..." -msgstr "" - -#~ msgid "rec-src" -#~ msgstr "Aufnahmequelle" +#: gmix/gmix.c:324 +msgid "Exit" +msgstr "Beenden" -#~ msgid "OK" -#~ msgstr "OK" +#. Button to dismiss the dialog +#: gmix/gmix.c:371 +msgid "OK" +msgstr "OK" Binary files gnome-media-0.25/po/es.gmo and gnome-media-0.27/po/es.gmo differ diff -uNr gnome-media-0.25/po/es.po gnome-media-0.27/po/es.po --- gnome-media-0.25/po/es.po Wed Aug 5 16:00:27 1998 +++ gnome-media-0.27/po/es.po Thu Jul 23 15:14:20 1998 @@ -1,11 +1,9 @@ msgid "" msgstr "" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" -"Content-Type: text/plain; charset=\n" "Date: 1998-04-24 16:08:06-0500\n" "From: Miguel de Icaza,computo,622-4680 \n" -"Xgettext-Options: --default-domain=gnome-media --directory=.. --add-comments " -"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" +"Content-Type: text/plain; charset=\n" +"Xgettext-Options: --default-domain=gnome-media --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" "Files: gmix/gmix.c\n" #: gmix/gmix.c:76 @@ -16,7 +14,6 @@ msgid "E" msgstr "S" -#. no options, yet #: gmix/gmix.c:79 msgid "Edit/Options..." msgstr "Edición/Opciones..." @@ -65,7 +62,3 @@ #: gmix/gmix.c:761 msgid "This is a mixer for OSS sound-devices." msgstr "Este es un mezclador para dispositivos de sonido OSS" - -#: gnomovision/tvset.c:1412 -msgid "FILE ..." -msgstr "" Binary files gnome-media-0.25/po/fr.gmo and gnome-media-0.27/po/fr.gmo differ diff -uNr gnome-media-0.25/po/fr.po gnome-media-0.27/po/fr.po --- gnome-media-0.25/po/fr.po Wed Aug 5 16:00:27 1998 +++ gnome-media-0.27/po/fr.po Fri Aug 14 14:29:39 1998 @@ -2,11 +2,11 @@ # Copyright (C) 1998 Free Software Foundation, Inc. # Vincent Renardias , 1998. # -#, fuzzy +# , fuzzy msgid "" msgstr "" "Project-Id-Version: gnome-media VERSION\n" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" +"POT-Creation-Date: 1998-08-01 03:26+0200\n" "PO-Revision-Date: 1998-02-22 19:26+0100\n" "Last-Translator: Vincent Renardias \n" "Language-Team: Vincent Renardias \n" @@ -22,7 +22,6 @@ msgid "E" msgstr "E" -#. no options, yet #: gmix/gmix.c:79 msgid "Edit/Options..." msgstr "Edition/Options..." @@ -37,15 +36,15 @@ #: gmix/gmix.c:86 msgid "don't restore mixer-settings from configuration" -msgstr "ne pas restaurer les préférences à partir de la configuration" +msgstr "ne pas restaurer les pr\351f\351rences \340 partir de la configuration" #: gmix/gmix.c:87 msgid "initialise the mixer(s) from stored configuration and exit" -msgstr "initialiser le(s) mixer(s) à partir de la configuration et quitter" +msgstr "initialiser le(s) mixer(s) \340 partir de la configuration et quitter" #: gmix/gmix.c:88 msgid "don't save (modified) mixer-settings into configuration" -msgstr "ne pas sauver (modifier) les préférences dansla configuration" +msgstr "ne pas sauver (modifier) les pr\351f\351rences dansla configuration" #: gmix/gmix.c:508 msgid "GMIX 3.0" @@ -54,7 +53,7 @@ #. lock-button, only useful for stereo #: gmix/gmix.c:576 msgid "Lock" -msgstr "Vérouiller" +msgstr "V\351rouiller" #: gmix/gmix.c:587 msgid "Rec." Binary files gnome-media-0.25/po/ga.gmo and gnome-media-0.27/po/ga.gmo differ diff -uNr gnome-media-0.25/po/ga.po gnome-media-0.27/po/ga.po --- gnome-media-0.25/po/ga.po Wed Aug 5 16:00:27 1998 +++ gnome-media-0.27/po/ga.po Thu Jul 23 15:14:20 1998 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnome-media VERSION\n" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" +"POT-Creation-Date: 1998-02-19 13:00+0100\n" "PO-Revision-Date: 1998-05-07 13:00+0100\n" "Last-Translator: \n" "Language-Team: Irish \n" @@ -14,68 +14,25 @@ "Content-Type: text/plain; charset=iso-8559-1\n" "Content-Transfer-Encoding: 8bit\n" -#: gmix/gmix.c:76 -#, fuzzy -msgid "File/Exit" -msgstr "Ealaigh" - -#: gmix/gmix.c:76 gmix/gmix.c:79 -msgid "E" -msgstr "" - -#. no options, yet -#: gmix/gmix.c:79 -msgid "Edit/Options..." -msgstr "" - -#: gmix/gmix.c:81 -msgid "Help/About..." -msgstr "" - -#: gmix/gmix.c:81 -msgid "A" -msgstr "" - -#: gmix/gmix.c:86 -msgid "don't restore mixer-settings from configuration" -msgstr "" - -#: gmix/gmix.c:87 -msgid "initialise the mixer(s) from stored configuration and exit" -msgstr "" - -#: gmix/gmix.c:88 -msgid "don't save (modified) mixer-settings into configuration" -msgstr "" - -#: gmix/gmix.c:508 -msgid "GMIX 3.0" -msgstr "" - #. lock-button, only useful for stereo -#: gmix/gmix.c:576 +#: gmix/gmix.c:266 msgid "Lock" msgstr "Glasal" -#: gmix/gmix.c:587 -msgid "Rec." -msgstr "" - -#: gmix/gmix.c:594 +#: gmix/gmix.c:275 msgid "Mute" msgstr "Cznas" -#: gmix/gmix.c:758 -msgid "GMIX - The Gnome Mixer" +#: gmix/gmix.c:289 +msgid "rec-src" msgstr "" -#: gmix/gmix.c:761 -msgid "This is a mixer for OSS sound-devices." -msgstr "" +#: gmix/gmix.c:324 +msgid "Exit" +msgstr "Ealaigh" -#: gnomovision/tvset.c:1412 -msgid "FILE ..." -msgstr "" +#. Button to dismiss the dialog +#: gmix/gmix.c:371 +msgid "OK" +msgstr "Togha" -#~ msgid "OK" -#~ msgstr "Togha" diff -uNr gnome-media-0.25/po/gnome-media.pot gnome-media-0.27/po/gnome-media.pot --- gnome-media-0.25/po/gnome-media.pot Tue Aug 4 16:30:27 1998 +++ gnome-media-0.27/po/gnome-media.pot Tue Aug 4 13:41:14 1998 @@ -1,18 +1,10 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. -# -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Date: 1998-08-04 13:41:14-0400\n" +"From: \n" +"Content-Type: text/plain; charset=\n" +"Xgettext-Options: --default-domain=gnome-media --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" +"Files: gmix/gmix.c gnomovision/tvset.c\n" #: gmix/gmix.c:76 msgid "File/Exit" @@ -22,7 +14,6 @@ msgid "E" msgstr "" -#. no options, yet #: gmix/gmix.c:79 msgid "Edit/Options..." msgstr "" Binary files gnome-media-0.25/po/it.gmo and gnome-media-0.27/po/it.gmo differ diff -uNr gnome-media-0.25/po/it.po gnome-media-0.27/po/it.po --- gnome-media-0.25/po/it.po Wed Aug 5 16:00:27 1998 +++ gnome-media-0.27/po/it.po Thu Jul 23 15:14:20 1998 @@ -1,78 +1,29 @@ msgid "" msgstr "" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" -"Content-Type: text/plain; charset=\n" "Date: 1998-02-23 16:41:25+0100\n" "From: Tristan Tarrant \n" -"Xgettext-Options: --default-domain=gnome-media --directory=.. --add-comments " -"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" +"Content-Type: text/plain; charset=\n" +"Xgettext-Options: --default-domain=gnome-media --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" "Files: gmix/gmix.c\n" -#: gmix/gmix.c:76 -#, fuzzy -msgid "File/Exit" -msgstr "Esci" - -#: gmix/gmix.c:76 gmix/gmix.c:79 -msgid "E" -msgstr "" - -#. no options, yet -#: gmix/gmix.c:79 -msgid "Edit/Options..." -msgstr "" - -#: gmix/gmix.c:81 -msgid "Help/About..." -msgstr "" - -#: gmix/gmix.c:81 -msgid "A" -msgstr "" - -#: gmix/gmix.c:86 -msgid "don't restore mixer-settings from configuration" -msgstr "" - -#: gmix/gmix.c:87 -msgid "initialise the mixer(s) from stored configuration and exit" -msgstr "" - -#: gmix/gmix.c:88 -msgid "don't save (modified) mixer-settings into configuration" -msgstr "" - -#: gmix/gmix.c:508 -msgid "GMIX 3.0" -msgstr "" - #. lock-button, only useful for stereo -#: gmix/gmix.c:576 +#: gmix/gmix.c:266 msgid "Lock" msgstr "Blocca" -#: gmix/gmix.c:587 -msgid "Rec." -msgstr "" - -#: gmix/gmix.c:594 +#: gmix/gmix.c:275 msgid "Mute" msgstr "Mute" -#: gmix/gmix.c:758 -msgid "GMIX - The Gnome Mixer" -msgstr "" - -#: gmix/gmix.c:761 -msgid "This is a mixer for OSS sound-devices." -msgstr "" +#: gmix/gmix.c:289 +msgid "rec-src" +msgstr "rec-src" -#: gnomovision/tvset.c:1412 -msgid "FILE ..." -msgstr "" - -#~ msgid "rec-src" -#~ msgstr "rec-src" +#: gmix/gmix.c:324 +msgid "Exit" +msgstr "Esci" -#~ msgid "OK" -#~ msgstr "OK" +#. Button to dismiss the dialog +#: gmix/gmix.c:371 +msgid "OK" +msgstr "OK" Binary files gnome-media-0.25/po/ko.gmo and gnome-media-0.27/po/ko.gmo differ diff -uNr gnome-media-0.25/po/ko.po gnome-media-0.27/po/ko.po --- gnome-media-0.25/po/ko.po Wed Aug 5 16:00:27 1998 +++ gnome-media-0.27/po/ko.po Thu Jul 23 15:14:20 1998 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNOME-media 0.13\n" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" +"POT-Creation-Date: 1998-02-12 15:24+0900\n" "PO-Revision-Date: 1998-02-17 10:33+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -14,71 +14,24 @@ "Content-Type: text/plain; charset=euc-kr\n" "Content-Transfer-Encoding: 8bit\n" -#: gmix/gmix.c:76 -#, fuzzy -msgid "File/Exit" -msgstr "³¡³»±â" - -#: gmix/gmix.c:76 gmix/gmix.c:79 -msgid "E" -msgstr "" - -#. no options, yet -#: gmix/gmix.c:79 -msgid "Edit/Options..." -msgstr "" - -#: gmix/gmix.c:81 -msgid "Help/About..." -msgstr "" - -#: gmix/gmix.c:81 -msgid "A" -msgstr "" - -#: gmix/gmix.c:86 -msgid "don't restore mixer-settings from configuration" -msgstr "" - -#: gmix/gmix.c:87 -msgid "initialise the mixer(s) from stored configuration and exit" -msgstr "" - -#: gmix/gmix.c:88 -msgid "don't save (modified) mixer-settings into configuration" -msgstr "" - -#: gmix/gmix.c:508 -msgid "GMIX 3.0" -msgstr "" - #. lock-button, only useful for stereo -#: gmix/gmix.c:576 +#: gmix/gmix.c:266 msgid "Lock" msgstr "Àá±Ý" -#: gmix/gmix.c:587 -msgid "Rec." -msgstr "" - -#: gmix/gmix.c:594 +#: gmix/gmix.c:275 msgid "Mute" msgstr "Á¶¿ë" -#: gmix/gmix.c:758 -msgid "GMIX - The Gnome Mixer" -msgstr "" +#: gmix/gmix.c:289 +msgid "rec-src" +msgstr "³ìÀ½Çϴ°÷" -#: gmix/gmix.c:761 -msgid "This is a mixer for OSS sound-devices." -msgstr "" - -#: gnomovision/tvset.c:1412 -msgid "FILE ..." -msgstr "" - -#~ msgid "rec-src" -#~ msgstr "³ìÀ½Çϴ°÷" +#: gmix/gmix.c:324 +msgid "Exit" +msgstr "³¡³»±â" -#~ msgid "OK" -#~ msgstr "È®ÀÎ" +#. Button to dismiss the dialog +#: gmix/gmix.c:371 +msgid "OK" +msgstr "È®ÀÎ" Binary files gnome-media-0.25/po/no.gmo and gnome-media-0.27/po/no.gmo differ diff -uNr gnome-media-0.25/po/no.po gnome-media-0.27/po/no.po --- gnome-media-0.25/po/no.po Wed Aug 5 16:00:27 1998 +++ gnome-media-0.27/po/no.po Thu Jul 23 15:14:20 1998 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnome-media-0.13\n" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" +"POT-Creation-Date: 1998-05-02 22:53+0200\n" "PO-Revision-Date: 1998-05-04 09:00+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -71,7 +71,3 @@ #: gmix/gmix.c:761 msgid "This is a mixer for OSS sound-devices." msgstr "Dette er en mikser for OSS lyd-enheter." - -#: gnomovision/tvset.c:1412 -msgid "FILE ..." -msgstr "" Binary files gnome-media-0.25/po/pt.gmo and gnome-media-0.27/po/pt.gmo differ diff -uNr gnome-media-0.25/po/pt.po gnome-media-0.27/po/pt.po --- gnome-media-0.25/po/pt.po Wed Aug 5 16:00:27 1998 +++ gnome-media-0.27/po/pt.po Thu Jul 23 15:14:20 1998 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: gnome-media 0.20\n" -"POT-Creation-Date: 1998-08-04 22:30+0200\n" +"POT-Creation-Date: 1998-04-25 05:16+0100\n" "PO-Revision-Date: 1998-07-01 08:25+01:00\n" "Last-Translator: Nuno Ferreira \n" "Language-Team: Portuguese \n" @@ -66,7 +66,3 @@ #: gmix/gmix.c:761 msgid "This is a mixer for OSS sound-devices." msgstr "Isto é uma mesa de mistura para dispositivos de som OSS" - -#: gnomovision/tvset.c:1412 -msgid "FILE ..." -msgstr "" diff -uNr gnome-media-0.25/tcd/Makefile.in gnome-media-0.27/tcd/Makefile.in --- gnome-media-0.25/tcd/Makefile.in Wed Aug 5 16:00:35 1998 +++ gnome-media-0.27/tcd/Makefile.in Fri Aug 14 14:29:44 1998 @@ -379,6 +379,19 @@ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done +cddb.o: cddb.c linux-cdrom.h socket.h cddb.h +gabout.o: gabout.c ../config.h +gcddb.o: gcddb.c ../config.h linux-cdrom.h gcddb.h socket.h cddb.h \ + properties.h +gtcd.o: gtcd.c ../config.h linux-cdrom.h cddb.h socket.h gtracked.h \ + gabout.h gcddb.h properties.h tooltips.h led.h +gtracked.o: gtracked.c ../config.h linux-cdrom.h +led.o: led.c led.h led.xpm +linux-cdrom.o: linux-cdrom.c linux-cdrom.h cddb.h socket.h +properties.o: properties.c properties.h +socket.o: socket.c socket.h +tcd.o: tcd.c linux-cdrom.h tcd.h tracked.h cddb.h socket.h +tracked.o: tracked.c linux-cdrom.h tcd.h tracked.h info: info-recursive dvi: dvi-recursive diff -uNr gnome-media-0.25/tcd/gabout.c gnome-media-0.27/tcd/gabout.c --- gnome-media-0.25/tcd/gabout.c Tue Aug 4 18:36:51 1998 +++ gnome-media-0.27/tcd/gabout.c Fri Aug 14 12:45:29 1998 @@ -35,13 +35,13 @@ }; about = gnome_about_new ( - "TCD - The Gnome CD Player", + N_("TCD - The Gnome CD Player"), "2.2 (CVS)", "(C) 1997-98 Tim P. Gerla", (const gchar**)authors, - "Gnome CD player application with CDDB support." - " Please see the \'Thanks\' file included with the" - " distribution for more credits.", + N_("Gnome CD player application with CDDB support." + " Please see the \'Thanks\' file included with the" + " distribution for more credits."), NULL); gtk_widget_show(about); diff -uNr gnome-media-0.25/tcd/gcddb.c gnome-media-0.27/tcd/gcddb.c --- gnome-media-0.25/tcd/gcddb.c Tue Aug 4 19:23:54 1998 +++ gnome-media-0.27/tcd/gcddb.c Fri Aug 14 12:45:29 1998 @@ -78,32 +78,32 @@ label = gtk_label_new(""); box = gtk_vbox_new( FALSE, 5 ); infobox = gtk_vbox_new( FALSE, 0 ); - infoframe = gtk_frame_new("Configuration:"); + infoframe = gtk_frame_new(N_("Configuration:")); gtk_frame_set_shadow_type(GTK_FRAME(infoframe),GTK_SHADOW_ETCHED_IN); gtk_container_add(GTK_CONTAINER(infoframe), infobox); - cddbwin = gtk_window_new( GTK_WINDOW_DIALOG ); + cddbwin = gtk_window_new(GTK_WINDOW_DIALOG); gtk_container_border_width (GTK_CONTAINER (cddbwin), 5); - gtk_window_set_title( GTK_WINDOW(cddbwin), "CDDB Remote" ); + gtk_window_set_title( GTK_WINDOW(cddbwin), N_("CDDB Remote") ); gtk_window_set_wmclass( GTK_WINDOW(cddbwin), "cddb","gtcd" ); /* cancel button */ - cancelbutton = gtk_button_new_with_label( "Close" ); + cancelbutton = gtk_button_new_with_label(N_("Close")); cancel_id = gtk_signal_connect (GTK_OBJECT (cancelbutton), "clicked", GTK_SIGNAL_FUNC(close_cddb), NULL); /* go button */ - startbutton = gtk_button_new_with_label( "Go" ); + startbutton = gtk_button_new_with_label(N_("Go")); start_id = gtk_signal_connect (GTK_OBJECT (startbutton), "clicked", GTK_SIGNAL_FUNC(do_cddb), NULL); - g_snprintf( tmp, 255, "Server: %s:%d\n", props.cddb, props.cddbport ); + g_snprintf( tmp, 255, N_("Server: %s:%d\n"), props.cddb, props.cddbport ); tmplabel = gtk_label_new(tmp); gtk_box_pack_start( GTK_BOX(infobox), tmplabel, FALSE, TRUE, 0 ); if( props.use_http ) { - g_snprintf( tmp, 255, "HTTP %s Enabled\n", - props.use_proxy?"and Proxy":"" ); + g_snprintf( tmp, 255, N_("HTTP %s Enabled\n"), + props.use_proxy?N_("and Proxy"):"" ); tmplabel = gtk_label_new(tmp); gtk_box_pack_start( GTK_BOX(infobox), tmplabel, FALSE, TRUE, 0 ); } @@ -152,7 +152,7 @@ strcpy(server.remote_path, props.remote_path); } - gtk_label_set( GTK_LABEL(label), "Connecting..." ); + gtk_label_set(GTK_LABEL(label), N_("Connecting...")); while(gtk_events_pending()) gtk_main_iteration(); if (server.http) { @@ -164,12 +164,12 @@ } else { if( tcd_open_cddb( &server, periodic ) != 0 ) { - sprintf( tmp, "Error: %s", server.error ); + sprintf( tmp, N_("Error: %s"), server.error ); gtk_label_set( GTK_LABEL(label), tmp ); return; } } - gtk_label_set( GTK_LABEL(label), "Connected!" ); + gtk_label_set( GTK_LABEL(label), N_("Connected!") ); gtk_progress_bar_update( GTK_PROGRESS_BAR(pb), 0.2); while(gtk_events_pending()) gtk_main_iteration(); @@ -178,7 +178,7 @@ } else { tcd_formatquery( &cd, qs, sizeof(qs) ); } - gtk_label_set( GTK_LABEL(label), "Sending query..." ); + gtk_label_set( GTK_LABEL(label), N_("Sending query...") ); r = send( server.socket, qs, strlen(qs), 0 ); #ifdef DEBUG g_print( "-> %s\n", qs ); @@ -186,10 +186,10 @@ gtk_progress_bar_update( GTK_PROGRESS_BAR(pb), 0.4); while(gtk_events_pending()) gtk_main_iteration(); - gtk_label_set( GTK_LABEL(label), "Reading results..." ); + gtk_label_set( GTK_LABEL(label), N_("Reading results...") ); if (server.http) { if (tcd_getquery_http(&server,&query, periodic)) { - gtk_label_set(GTK_LABEL(label),"Error: Unable to open cddb read socket\n"); + gtk_label_set(GTK_LABEL(label),N_("Error: Unable to open cddb read socket\n")); return; } } else { @@ -198,7 +198,7 @@ gtk_progress_bar_update( GTK_PROGRESS_BAR(pb), 0.6); while(gtk_events_pending()) gtk_main_iteration(); - gtk_label_set( GTK_LABEL(label), "Downloading data..." ); + gtk_label_set( GTK_LABEL(label), N_("Downloading data...") ); if (server.http) { tcd_formatread_http(&cd,qs,sizeof(qs),server.hostname,server.port,server.remote_path,query.categ,query.discid); send( server.socket, qs, strlen(qs), 0 ); @@ -216,7 +216,7 @@ outfile = fopen( qs, "w" ); if (outfile == NULL) { - gtk_label_set( GTK_LABEL(label), "Can't open local file." ); + gtk_label_set( GTK_LABEL(label), N_("Can't open local file.") ); close(server.socket); return; } @@ -236,7 +236,7 @@ /* Urk. cddb.howto is broken. */ if( result != 200 && result != 210 ) { - gtk_label_set( GTK_LABEL(label), "Exact match not found." ); + gtk_label_set(GTK_LABEL(label), N_("Exact match not found.")); fclose(outfile); close(server.socket); return; @@ -250,14 +250,14 @@ g_print( "<- %s\n", s ); #endif fprintf( outfile, "%s\n", s ); - sprintf( tmp, "Downloading line %3d...",i++ ); + sprintf( tmp, N_("Downloading line %3d..."),i++ ); gtk_label_set( GTK_LABEL(label), tmp ); while(gtk_events_pending()) gtk_main_iteration(); } while( strcmp( ".", s ) ); fclose(outfile); close(server.socket); - gtk_label_set( GTK_LABEL(label), "Done!" ); + gtk_label_set( GTK_LABEL(label), N_("Done!") ); tcd_close_disc(&cd); tcd_init_disc(&cd, create_warn); @@ -270,4 +270,4 @@ gtk_signal_disconnect( GTK_OBJECT(cancelbutton), cancel_id ); cancel_id = gtk_signal_connect (GTK_OBJECT(cancelbutton), "clicked", GTK_SIGNAL_FUNC(close_cddb), NULL); -} +} diff -uNr gnome-media-0.25/tcd/gtcd.c gnome-media-0.27/tcd/gtcd.c --- gnome-media-0.25/tcd/gtcd.c Tue Aug 4 19:36:31 1998 +++ gnome-media-0.27/tcd/gtcd.c Fri Aug 14 12:45:29 1998 @@ -376,7 +376,7 @@ gtk_container_add( GTK_CONTAINER(gotobutton), bbox); gtk_box_pack_start( GTK_BOX(box), gotobutton, TRUE, TRUE, 0); - make_button_with_pixmap( "power", box, QUIT, TRUE, TRUE, "Quit" ); + make_button_with_pixmap( "power", box, QUIT, TRUE, TRUE, N_("Quit") ); gtk_widget_show_all(box); @@ -500,9 +500,10 @@ void draw_time_scanning( GdkGC *gc ) { gdk_gc_set_foreground( gc, &track_color ); - gdk_draw_text(status_db,tfont,gc,4,39+(tfont->ascent+tfont->descent)-2, "(Scanning)", - 10); - gtk_window_set_title( GTK_WINDOW(window), "(Scanning)" ); + gdk_draw_text(status_db,tfont,gc,4,39+(tfont->ascent+tfont->descent)-2, + N_("(Scanning)"), + 10); + gtk_window_set_title( GTK_WINDOW(window), N_("(Scanning)") ); } void draw_status( void ) @@ -528,7 +529,7 @@ switch( cd.sc.cdsc_audiostatus ) { case CDROM_AUDIO_INVALID: - strcpy( tmp,"No Disc" ); + strcpy(tmp, N_("No Disc")); gdk_draw_text( status_db,tfont,gc,4,39,tmp, strlen(tmp) ); draw_time_scanning(gc); break; @@ -556,7 +557,7 @@ draw_time_scanning(gc); break; case CDROM_AUDIO_ERROR: - strcpy( tmp,"Error" ); + strcpy( tmp,N_("Error") ); gdk_draw_text( status_db,tfont,gc,4,39,tmp, strlen(tmp) ); draw_time_scanning(gc); break; @@ -815,8 +816,6 @@ draw_status(); return TRUE; } - - } return FALSE; diff -uNr gnome-media-0.25/tcd/gtracked.c gnome-media-0.27/tcd/gtracked.c --- gnome-media-0.25/tcd/gtracked.c Tue Aug 4 19:23:57 1998 +++ gnome-media-0.27/tcd/gtracked.c Fri Aug 14 12:45:29 1998 @@ -107,7 +107,7 @@ void edit_window( void ) { - char *titles[] = {"Trk","Time","Title"}; + char *titles[] = {N_("Trk"),N_("Time"),N_("Title")}; GtkWidget *disc_entry, *disc_ext; GtkWidget *label, *disc_frame, *button_box; @@ -122,7 +122,7 @@ trwin = gtk_window_new(GTK_WINDOW_DIALOG); gtk_container_border_width(GTK_CONTAINER(trwin), 5); - gtk_window_set_title(GTK_WINDOW(trwin), "Track Editor"); + gtk_window_set_title(GTK_WINDOW(trwin), N_("Track Editor")); gtk_window_set_wmclass(GTK_WINDOW(trwin), "track_editor","gtcd"); gtk_signal_connect(GTK_OBJECT(trwin), "delete_event", @@ -137,9 +137,9 @@ /* Disc area */ disc_table = gtk_table_new(2, 2, FALSE); - disc_frame = gtk_frame_new("Disc Information"); - label = gtk_label_new("Artist / Title"); - disc_ext = gtk_button_new_with_label("Ext Data"); + disc_frame = gtk_frame_new(N_("Disc Information")); + label = gtk_label_new(N_("Artist / Title")); + disc_ext = gtk_button_new_with_label(N_("Ext Data")); gtk_widget_set_sensitive(disc_ext, FALSE); disc_entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(disc_entry), cd.dtitle); @@ -160,7 +160,7 @@ entry_box = gtk_hbox_new(FALSE, 2); track_entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(track_entry), cd.trk[1].name); - track_ext = gtk_button_new_with_label("Ext Data"); + track_ext = gtk_button_new_with_label(N_("Ext Data")); gtk_widget_set_sensitive(track_ext, FALSE); track_list = gtk_clist_new_with_titles(3, titles); gtk_clist_set_border(GTK_CLIST(track_list), GTK_SHADOW_NONE); @@ -173,7 +173,7 @@ gtk_clist_column_titles_passive(GTK_CLIST(track_list)); gtk_widget_set_usize(track_list, 150, 225 ); fill_list(track_list); - track_frame = gtk_frame_new("Track Information"); + track_frame = gtk_frame_new(N_("Track Information")); gtk_box_pack_start_defaults(GTK_BOX(entry_box), track_entry); gtk_box_pack_start_defaults(GTK_BOX(entry_box), track_ext); @@ -184,16 +184,16 @@ /* END Track area */ button_box = gtk_hbox_new(FALSE,2); - button = gtk_button_new_with_label("CDDB Get"); + button = gtk_button_new_with_label(N_("CDDB Get")); gtk_widget_set_sensitive(button, FALSE); gtk_box_pack_start_defaults(GTK_BOX(button_box), button); - button = gtk_button_new_with_label("Submit"); + button = gtk_button_new_with_label(N_("Submit")); gtk_widget_set_sensitive(button, FALSE); gtk_box_pack_start_defaults(GTK_BOX(button_box), button); - button = gtk_button_new_with_label("Clear"); + button = gtk_button_new_with_label(N_("Clear")); gtk_widget_set_sensitive(button, FALSE); gtk_box_pack_start_defaults(GTK_BOX(button_box), button); - button = gtk_button_new_with_label("Playlist"); + button = gtk_button_new_with_label(N_("Playlist")); gtk_widget_set_sensitive(button, FALSE); gtk_box_pack_start_defaults(GTK_BOX(button_box), button); gtk_box_pack_start_defaults(GTK_BOX(main_box), button_box); diff -uNr gnome-media-0.25/tcd/gtracked.h gnome-media-0.27/tcd/gtracked.h --- gnome-media-0.25/tcd/gtracked.h Tue Aug 4 19:23:58 1998 +++ gnome-media-0.27/tcd/gtracked.h Fri Aug 14 12:45:29 1998 @@ -28,12 +28,6 @@ #ifndef GTRACKED_H #define GTRACKED_H -struct pass_str -{ - cd_struct *cd; - GtkWidget *window; -}; - void edit_window( void ); void destroy_window (GtkWidget *widget, GtkWidget **window); void gtracked(); diff -uNr gnome-media-0.25/tcd/linux-cdrom.c gnome-media-0.27/tcd/linux-cdrom.c --- gnome-media-0.25/tcd/linux-cdrom.c Tue Aug 4 19:24:00 1998 +++ gnome-media-0.27/tcd/linux-cdrom.c Fri Aug 14 12:45:29 1998 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -300,6 +301,7 @@ int tcd_playtracks( cd_struct *cd, int start_t, int end_t ) { struct cdrom_msf msf; + struct cdrom_ti trkind; int tmp; debug("cdrom.c: tcd_playtracks( %p, %d, %d )\n", cd, start_t, end_t ); cd->err = FALSE; @@ -336,10 +338,21 @@ if( tmp < 0 ) { - strcpy( cd->errmsg, "Error playing disc" ); - cd->err = TRUE; - debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error.\n" ); - return -1; + debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error. Trying PLAYTRKIND\n" ); + /* Try alternate method of playing FIXME: handle -1 end_t */ + trkind.cdti_trk0 = start_t; /* start track */ + trkind.cdti_ind0 = 0; /* start index */ + trkind.cdti_trk1 = end_t; /* end track */ + trkind.cdti_ind1 = 0; /* end index */ + + tmp = ioctl( cd->cd_dev, CDROMPLAYTRKIND, &trkind ); + if( tmp < 0 ) + { + strcpy( cd->errmsg, "Error playing disc" ); + cd->err = TRUE; + debug("cdrom.c: tcd_playtracks error. CDROMPLAYTRKIND ioctl error.\n" ); + return -1; + } } cd->isplayable=TRUE; cd->isdisk=TRUE; diff -uNr gnome-media-0.25/tcd/properties.c gnome-media-0.27/tcd/properties.c --- gnome-media-0.25/tcd/properties.c Tue Aug 4 19:24:01 1998 +++ gnome-media-0.27/tcd/properties.c Fri Aug 14 12:45:29 1998 @@ -149,7 +149,7 @@ proxy_l_box = gtk_vbox_new(FALSE,2); /* http checkbox */ - http_check = gtk_check_button_new_with_label("Use HTTP"); + http_check = gtk_check_button_new_with_label(N_("Use HTTP")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(http_check), props.use_http); gtk_signal_connect(GTK_OBJECT(http_check),"toggled", GTK_SIGNAL_FUNC(http_checked),NULL); @@ -161,7 +161,7 @@ gtk_container_add(GTK_CONTAINER(httpframe), http_box); /* remote path entry & label */ - label = gtk_label_new("Path:"); + label = gtk_label_new(N_("Path:")); path_entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(path_entry), props.remote_path ); props.remote_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(path_entry))); @@ -172,19 +172,19 @@ gtk_box_pack_start(GTK_BOX(path_box), path_entry, TRUE, TRUE, 0); /* proxy checkbox */ - proxy_check = gtk_check_button_new_with_label("Use Proxy Server"); + proxy_check = gtk_check_button_new_with_label(N_("Use Proxy Server")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(proxy_check), props.use_proxy); gtk_signal_connect(GTK_OBJECT(proxy_check),"toggled", GTK_SIGNAL_FUNC(proxy_checked),NULL); /* proxy frame */ - proxyframe = gtk_frame_new("Proxy"); + proxyframe = gtk_frame_new(N_("Proxy")); gtk_widget_set_sensitive(proxyframe,props.use_proxy); gtk_frame_set_shadow_type(GTK_FRAME(proxyframe),GTK_SHADOW_ETCHED_IN); gtk_container_add(GTK_CONTAINER(proxyframe), proxy_box); /* proxy server */ - label = gtk_label_new("Server:"); + label = gtk_label_new(N_("Server:")); proxy_server_entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(proxy_server_entry), props.proxy_server ); gtk_box_pack_start(GTK_BOX(proxy_l_box), label, TRUE, TRUE, 0); @@ -194,7 +194,7 @@ GTK_SIGNAL_FUNC(changed_cb), NULL ); /* proxy port */ - label = gtk_label_new("Port:"); + label = gtk_label_new(N_("Port:")); adj = gtk_adjustment_new( props.proxy_port, 1, 9999, 1, 10, 10 ); proxy_port_spin = gtk_spin_button_new( GTK_ADJUSTMENT(adj), 1,0 ); gtk_spin_button_set_shadow_type(GTK_SPIN_BUTTON(proxy_port_spin), @@ -231,10 +231,10 @@ cddb_r_box = gtk_vbox_new( FALSE, 2 ); cddb_l_box = gtk_vbox_new( FALSE, 2 ); cddb_box = gtk_hbox_new( FALSE, 2 ); - cddb_frame = gtk_frame_new("CDDB Access"); + cddb_frame = gtk_frame_new(N_("CDDB Access")); /* server entry */ - label = gtk_label_new("Server:"); + label = gtk_label_new(N_("Server:")); gtk_label_set_justify( GTK_LABEL(label), GTK_JUSTIFY_RIGHT ); cddb_i = gtk_entry_new(); gtk_entry_set_text( GTK_ENTRY(cddb_i), props.cddb ); @@ -245,7 +245,7 @@ gtk_box_pack_start( GTK_BOX(cddb_r_box), cddb_i,TRUE, TRUE, 0 ); /* port spinner */ - label = gtk_label_new("Port:"); + label = gtk_label_new(N_("Port:")); gtk_label_set_justify( GTK_LABEL(label), GTK_JUSTIFY_RIGHT ); adj = gtk_adjustment_new( props.cddbport, 1, 9999, 1, 10, 10 ); port_i = gtk_spin_button_new( GTK_ADJUSTMENT(adj), 1,0 ); @@ -281,10 +281,10 @@ cdrom_r_box= gtk_vbox_new( FALSE, 2 ); cdrom_l_box= gtk_vbox_new( FALSE, 2 ); cdrom_box = gtk_hbox_new( FALSE, 2 ); - cdrom_frame = gtk_frame_new("CDROM Drive"); + cdrom_frame = gtk_frame_new(N_("CDROM Drive")); /* cdrom device */ - label = gtk_label_new("Device:"); + label = gtk_label_new(N_("Device:")); gtk_label_set_justify( GTK_LABEL(label), GTK_JUSTIFY_RIGHT ); cddev_i = gtk_entry_new(); gtk_entry_set_text( GTK_ENTRY(cddev_i), props.cddev ); @@ -383,31 +383,21 @@ status_table = gtk_table_new( 4, 2, FALSE ); track_gcs = gnome_color_selector_new((SetColorFunc)track_color_changed_cb, NULL ); - status_gcs = gnome_color_selector_new((SetColorFunc)track_color_changed_cb,NULL ); - trackbutton_f = gtk_button_new_with_label( "Title/Track Font" ); - statusbutton_f = gtk_button_new_with_label( "fsdafd Font" ); + trackbutton_f = gtk_button_new_with_label( N_("Title/Track Font") ); gtk_signal_connect( GTK_OBJECT(trackbutton_f), "clicked", GTK_SIGNAL_FUNC(track_font_cb), NULL ); - gtk_signal_connect( GTK_OBJECT(statusbutton_f), "clicked", - GTK_SIGNAL_FUNC(status_font_cb), NULL ); gnome_color_selector_set_color_int( track_gcs, tr, tg, tb, 255 ); - gnome_color_selector_set_color_int( status_gcs, rr, rg, rb, 255 ); trackbutton_c = gnome_color_selector_get_button( track_gcs ); - statusbutton_c = gnome_color_selector_get_button( status_gcs ); - track_l = gtk_label_new("Title/Track Display"); - status_l = gtk_label_new("fasdfasdf Display"); + track_l = gtk_label_new(N_("Title/Track Display")); - frame = gtk_frame_new("Fonts & Colors"); + frame = gtk_frame_new(N_("Fonts & Colors")); gtk_table_attach_defaults( GTK_TABLE(status_table), track_l, 0,2,0,1 ); -/* gtk_table_attach_defaults( GTK_TABLE(status_table), - status_l, 0,2,1,2 ); - */ gtk_table_attach( GTK_TABLE(status_table), trackbutton_c, 2,3,0,1, 0,0,2,2 ); @@ -415,13 +405,6 @@ trackbutton_f, 3,4,0,1, GTK_EXPAND,0,2,2 ); -/* gtk_table_attach( GTK_TABLE(status_table), - statusbutton_c, 2,3,1,2, - 0,0,2,2 ); - gtk_table_attach( GTK_TABLE(status_table), - statusbutton_f, 3,4,1,2, - GTK_EXPAND,0,2,2 ); -*/ gtk_container_add( GTK_CONTAINER(frame), status_table ); gtk_widget_show_all(frame); @@ -443,13 +426,13 @@ ui_l_box= gtk_vbox_new( FALSE, 2 ); ui_box = gtk_hbox_new( TRUE, 2 ); - handle_i = gtk_check_button_new_with_label("Show Handles (Restart of TCD required)"); - tooltips_i = gtk_check_button_new_with_label("Show Tooltips"); + handle_i = gtk_check_button_new_with_label(N_("Show Handles (Restart of TCD required)")); + tooltips_i = gtk_check_button_new_with_label(N_("Show Tooltips")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(handle_i), props.handle ); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(tooltips_i), props.tooltip ); - ui_frame = gtk_frame_new("General"); + ui_frame = gtk_frame_new(N_("General")); gtk_signal_connect( GTK_OBJECT(handle_i), "clicked", GTK_SIGNAL_FUNC(check_changed_cb), &props.handle ); @@ -550,19 +533,19 @@ gtk_window_set_title( GTK_WINDOW(&GNOME_PROPERTY_BOX(propbox)->dialog.window), "TCD Settings" ); page1 = create_page1(); - label = gtk_label_new("General"); + label = gtk_label_new(N_("General")); gtk_widget_show(page1); gtk_notebook_append_page(GTK_NOTEBOOK(GNOME_PROPERTY_BOX(propbox)->notebook), page1, label); page2 = create_page2(); - label = gtk_label_new("HTTP/Proxy"); + label = gtk_label_new(N_("HTTP/Proxy")); gtk_widget_show(page2); gtk_notebook_append_page(GTK_NOTEBOOK(GNOME_PROPERTY_BOX(propbox)->notebook), page2, label); page3 = create_page3(); - label = gtk_label_new("Interface"); + label = gtk_label_new(N_("Interface")); gtk_widget_show(page3); gtk_notebook_append_page(GTK_NOTEBOOK(GNOME_PROPERTY_BOX(propbox)->notebook), page3, label);