[SCM] front-end for the arcade games emulator MAME branch, upstream, updated. upstream/0.2.8-2-g715a99d

Loïc Martin loic.martin3 at gmail.com
Tue Jul 14 11:56:57 UTC 2009


The following commit has been merged in the upstream branch:
commit 715a99d739cbcec639796e8e8ba980e48dd9961c
Author: Loïc Martin <loic.martin3 at gmail.com>
Date:   Mon Jul 13 22:53:48 2009 +0200

    Imported Upstream version 0.2.10

diff --git a/AUTHORS b/AUTHORS
index 0899b65..d968008 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,3 +15,6 @@ Translators:
 
 pt_BR (Brazilian Portugese) - Alfredo Jr <junix at linuxinabox.org>
 it (Italian) - Ugo Viti <ugo.viti at initzero.it>
+sv (Swedish) - Daniel Nylander <dnylander at users.sourceforge.net>
+fr (French) - Loïc Martin <loic.martin3 at gmail.com>
+
diff --git a/ChangeLog b/ChangeLog
index 489de88..fa47649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+2009-07-03 20:35 adburton
+
+	* configure.ac, NEWS: Tagged for new release
+
+2009-07-02 20:45 adburton
+
+	* INSTALL: Updated installation instructions for CVS
+	* src/interface.c: Remember choice of selected filter button upon start
+
+2009-06-27 15:08 adburton
+
+	* AUTHORS, src/about.c: New French translation
+
+2009-06-26 20:58 adburton
+
+	* src/: gui.c, gui.h, interface.c, gmameui.c: Fix segfault if Glade data
+	files could not be loaded on startup
+	* src/game_list.c: Move free of string after debug line
+	* src/interface.c: Set UI items disabled if no executable or games listed
+	* src/interface.h: ifdef out treeview items to hide Gtk-CRITICAL warnings
+	on startup
+	* src/gui_prefs.c: Report and clear GError to fix Gtk-CRITICAL warnings on
+	startup
+	* src/gmameui-gamelist-view.c: Fix compilation warnings
+
+2009-06-23 18:55 adburton
+
+	* data/gmameui_prefs.glade, src/: gmameui-gamelist-view.c,
+	  gmameui-rominfo-dlg.c, gui.c, gui.h, gui_prefs.c, gui_prefs.h,
+	  gui_prefs_dialog.c: New preference option for using custom icons where
+	  available instead of status icons. Also retain the setting even the ROM
+	  is played or audited (SF Bug 2011168)
+	* src/gmameui-rominfo-dlg.c: Fix free of const gchar pointer
+
+2009-06-20 20:05 adburton
+
+	* INSTALL: Updated list of dependencies
+	* configure.ac,
+	  src/: Makefile.am, gmameui-gamelist-view.c, gui.c, gui.h,
+	  gmameui-sidebar.c, gmameui-sidebar.h, gmameui-zip-utils.c,
+	  gmameui-zip-utils.h, unzip.c, unzip.h: Remove non-GPL friendly
+	  unzip.c and unzip.h and replace with libarchive functions
+
+2009-06-11 20:30 adburton
+
+	* src/*.[ch]: Update copyright headers to replace FSF physical address
+	  with web address, use GPL v3 as per COPYING file
+
+2009-06-06 21:47 adburton
+
+	* src/mame-exec.c, mame-exec.h, mame_options_legacy.c, 
+	  mame_options_legacy_dialog.c, xmame_options.c,
+	  data/options_legacy.glade: Changes for legacy XMAME support:
+	  - Add support for XMAME legacy options -scanlines, -volume
+	  - Fix mis-spelled XMAME legacy option -gltexture_size
+	  - Fix XMAME legacy options using GtkComboBox widgets (-effect, -bios, 
+	    -samplefreq, -bpp, -artwork_resolution, -joytype)
+	  - Fix XMAME legacy options using GtkHSscale widgets
+	  - Fix link between parent option Artwork and child options Backdrops, 
+	    Bezels and Overlays
+	  - Support for older versions of XMAME not supporting [no] prefix for 
+	    disabling toggle options
+	  - Fix crash when opening XMAME Legacy Options screen (add support for 
+	    option keys containing numbers e.g. X11Input)
+
 2009-06-05 19:30 adburton
 
 	* configure.ac, NEWS, src/about.c: Tagged for new release
diff --git a/INSTALL b/INSTALL
index dd73d1d..7408462 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,6 +3,7 @@ Installing
 
 To install from source:
 
+sh autogen.sh (if you have downloaded from CVS)
 ./configure
 make
 make install (as root)
@@ -14,3 +15,12 @@ rpmbuild -ta gmameui-x.y.z.tar.gz
 Releases (tarballs and RPMs) can be generated using:
 
 make release
+
+Dependencies
+============
+
+libarchive-dev
+libexpat-dev
+libgtk2.0-dev
+libglade2-dev
+libgnome2-dev
diff --git a/Makefile.in b/Makefile.in
index e6b24cf..5f47f12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,6 +104,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+ARCHIVE_LIBS = @ARCHIVE_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/NEWS b/NEWS
index 793c406..5698ae1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Overview of changes in GMAMEUI 0.2.10
+=====================================
+
+* Replace non-GPL zip handling code
+
+* Add new GMAMEUI Preferences option to prefer either custom icons (using
+  icons.zip) or status icons (SF Bug 2011168)
+
+* Fix some broken legacy XMAME options handling
+
+* New French translation, updated Italian and Portugese translations
+
+* Fix some compilation/runtime GTK warnings
+
 Overview of changes in GMAMEUI 0.2.9
 ====================================
 
diff --git a/config.guess b/config.guess
index f32079a..da83314 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2009-04-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -796,7 +812,7 @@ EOF
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    EM64T | authenticamd | genuineintel)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -935,6 +951,9 @@ EOF
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -985,9 +1004,6 @@ EOF
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
@@ -1102,8 +1118,11 @@ EOF
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1141,6 +1160,16 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1216,6 +1245,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1324,6 +1356,9 @@ EOF
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.h.in b/config.h.in
index a24af8f..56971be 100644
--- a/config.h.in
+++ b/config.h.in
@@ -93,9 +93,6 @@
 /* Define to 1 if you have the `xmlparse' library (-lxmlparse). */
 #undef HAVE_LIBXMLPARSE
 
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
diff --git a/config.sub b/config.sub
index 6759825..a39437d 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2009-04-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -249,13 +250,16 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -268,6 +272,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@@ -277,7 +282,7 @@ case $basic_machine in
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -286,7 +291,7 @@ case $basic_machine in
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -329,14 +334,17 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -358,20 +366,20 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -439,6 +447,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -459,6 +471,10 @@ case $basic_machine in
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -526,6 +542,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -1128,6 +1148,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1166,7 +1190,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1238,8 +1262,9 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,7 +1273,7 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1388,6 +1413,9 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
diff --git a/configure b/configure
index 140ac86..bcd53da 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for gmameui 0.2.9.
+# Generated by GNU Autoconf 2.63 for gmameui 0.2.10.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gmameui'
 PACKAGE_TARNAME='gmameui'
-PACKAGE_VERSION='0.2.9'
-PACKAGE_STRING='gmameui 0.2.9'
+PACKAGE_VERSION='0.2.10'
+PACKAGE_STRING='gmameui 0.2.10'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -706,6 +706,7 @@ MKINSTALLDIRS
 GETTEXT_PACKAGE
 PACKAGE_PIXMAPS_DIR
 gmameuipath
+ARCHIVE_LIBS
 GNOME_LIBS
 GNOME_CFLAGS
 GLADE2_LIBS
@@ -1379,7 +1380,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gmameui 0.2.9 to adapt to many kinds of systems.
+\`configure' configures gmameui 0.2.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1449,7 +1450,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gmameui 0.2.9:";;
+     short | recursive ) echo "Configuration of gmameui 0.2.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1569,7 +1570,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gmameui configure 0.2.9
+gmameui configure 0.2.10
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1583,7 +1584,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gmameui $as_me 0.2.9, which was
+It was created by gmameui $as_me 0.2.10, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2301,7 +2302,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gmameui'
- VERSION='0.2.9'
+ VERSION='0.2.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5064,85 +5065,6 @@ fi
 done
 
 
-{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
-$as_echo_n "checking for inflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_inflate+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char inflate ();
-int
-main ()
-{
-return inflate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_z_inflate=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_z_inflate=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-$as_echo "$ac_cv_lib_z_inflate" >&6; }
-if test "x$ac_cv_lib_z_inflate" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-else
-  { { $as_echo "$as_me:$LINENO: error: Cannot find zlib" >&5
-$as_echo "$as_me: error: Cannot find zlib" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
 { $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
 $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
 if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
@@ -6241,6 +6163,99 @@ fi
 
 fi
 
+
+{ $as_echo "$as_me:$LINENO: checking for library containing archive_read_new" >&5
+$as_echo_n "checking for library containing archive_read_new... " >&6; }
+if test "${ac_cv_search_archive_read_new+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char archive_read_new ();
+int
+main ()
+{
+return archive_read_new ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' archive; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_archive_read_new=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_archive_read_new+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_archive_read_new+set}" = set; then
+  :
+else
+  ac_cv_search_archive_read_new=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_archive_read_new" >&5
+$as_echo "$ac_cv_search_archive_read_new" >&6; }
+ac_res=$ac_cv_search_archive_read_new
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  ARCHIVE_LIBS=-larchive
+else
+  { { $as_echo "$as_me:$LINENO: error: Cannot find libarchive" >&5
+$as_echo "$as_me: error: Cannot find libarchive" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 # Extract the first word of "gmameui", so it can be a program name with args.
 set dummy gmameui; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -12308,7 +12323,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gmameui $as_me 0.2.9, which was
+This file was extended by gmameui $as_me 0.2.10, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12371,7 +12386,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-gmameui config.status 0.2.9
+gmameui config.status 0.2.10
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 2e92017..9d2a862 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([gmameui], [0.2.9])
+AC_INIT([gmameui], [0.2.10])
 AC_PREREQ(2.5)
 
 AM_INIT_AUTOMAKE
@@ -10,7 +10,7 @@ AC_ISC_POSIX
 AC_PROG_CC
 AC_HEADER_STDC
 AC_CHECK_FUNCS(strchr)
-AC_CHECK_LIB(z,inflate,,AC_MSG_ERROR(Cannot find zlib))
+dnl AC_CHECK_LIB(z,inflate,,AC_MSG_ERROR(Cannot find zlib))
 AC_CHECK_LIB(expat, XML_ParserCreate,,
   AC_CHECK_LIB(xmlparse, XML_ParserCreate,,AC_MSG_ERROR(Cannot find libexpat))
 )
@@ -48,6 +48,14 @@ else
    AC_SUBST(GNOME_LIBS)
 fi
 
+
+dnl Check for the existence of libarchive, to support reading and writing
+dnl compressed (zip) files
+dnl AC_CHECK_LIB([archive], [archive_read_open_filename],, AC_MSG_ERROR([Cannot find libarchive])) 
+AC_SEARCH_LIBS([archive_read_new], [archive],
+    ARCHIVE_LIBS=-larchive AC_SUBST(ARCHIVE_LIBS),
+    AC_MSG_ERROR([Cannot find libarchive]))
+
 AC_PATH_PROG(gmameuipath, gmameui)
 dnl Subst PACKAGE_PIXMAPS_DIR.
 PACKAGE_PIXMAPS_DIR="${prefix}/${DATADIRNAME}/pixmaps/${PACKAGE}"
diff --git a/data/Makefile.in b/data/Makefile.in
index b554173..759819a 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -67,6 +67,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+ARCHIVE_LIBS = @ARCHIVE_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/data/gmameui_prefs.glade b/data/gmameui_prefs.glade
index 531dd0a..e439789 100644
--- a/data/gmameui_prefs.glade
+++ b/data/gmameui_prefs.glade
@@ -18,6 +18,7 @@
             <child>
               <widget class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
+                <property name="spacing">6</property>
                 <child>
                   <widget class="GtkLabel" id="label1">
                     <property name="visible">True</property>
@@ -109,6 +110,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="max_length">20</property>
+                                <property name="invisible_char">&#x25CF;</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
@@ -134,23 +136,22 @@
                 </child>
               </widget>
               <packing>
+                <property name="padding">6</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <widget class="GtkVBox" id="vbox4">
                 <property name="visible">True</property>
+                <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkLabel" id="label2">
+                  <widget class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Visible Columns&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">&lt;b&gt;User Interface Options&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">6</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -159,153 +160,206 @@
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkTable" id="table1">
+                      <widget class="GtkVBox" id="vbox5">
                         <property name="visible">True</property>
-                        <property name="n_rows">5</property>
-                        <property name="n_columns">2</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <widget class="GtkCheckButton" id="col_samples">
-                            <property name="label" translatable="yes">Samples</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" id="col_directory">
-                            <property name="label" translatable="yes">Directory</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" id="col_playcount">
-                            <property name="label" translatable="yes">Playcount</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" id="col_manufacturer">
-                            <property name="label" translatable="yes">Manufacturer</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" id="col_year">
-                            <property name="label" translatable="yes">Year</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" id="col_cloneof">
-                            <property name="label" translatable="yes">Clone of</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                          </packing>
-                        </child>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkCheckButton" id="col_driver">
-                            <property name="label" translatable="yes">Driver</property>
+                          <widget class="GtkCheckButton" id="theprefix">
+                            <property name="label" translatable="yes">'The' as a prefix</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="col_version">
-                            <property name="label" translatable="yes">Version</property>
+                          <widget class="GtkCheckButton" id="prefercustomicons">
+                            <property name="label" translatable="yes">Prefer custom icons over status icons</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="col_category">
-                            <property name="label" translatable="yes">Category</property>
+                          <widget class="GtkLabel" id="label2">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Visible columns</property>
+                            <property name="use_markup">True</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="col_gamename">
-                            <property name="label" translatable="yes">Game Name</property>
+                          <widget class="GtkAlignment" id="alignment3">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkTable" id="table1">
+                                <property name="visible">True</property>
+                                <property name="n_rows">5</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">6</property>
+                                <property name="row_spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_samples">
+                                    <property name="label" translatable="yes">Samples</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_directory">
+                                    <property name="label" translatable="yes">Directory</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_playcount">
+                                    <property name="label" translatable="yes">Playcount</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_manufacturer">
+                                    <property name="label" translatable="yes">Manufacturer</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_year">
+                                    <property name="label" translatable="yes">Year</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_cloneof">
+                                    <property name="label" translatable="yes">Clone of</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_driver">
+                                    <property name="label" translatable="yes">Driver</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_version">
+                                    <property name="label" translatable="yes">Version</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_category">
+                                    <property name="label" translatable="yes">Category</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="col_gamename">
+                                    <property name="label" translatable="yes">Game Name</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                       </widget>
@@ -314,63 +368,14 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox5">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Miscellaneous Options&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="padding">6</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkAlignment" id="alignment3">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <widget class="GtkVBox" id="vbox6">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <widget class="GtkCheckButton" id="theprefix">
-                            <property name="label" translatable="yes">'The' as a prefix</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </widget>
               <packing>
-                <property name="position">2</property>
+                <property name="padding">6</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </widget>
diff --git a/data/options_legacy.glade b/data/options_legacy.glade
index 92ba217..ca917d1 100644
--- a/data/options_legacy.glade
+++ b/data/options_legacy.glade
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Jan  6 23:18:01 2009 -->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="Display">
     <child>
       <widget class="GtkNotebook" id="DisplayNotebook">
@@ -22,6 +22,7 @@
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -36,20 +37,23 @@
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-fullscreen">
+                        <property name="label" translatable="yes">Fullscreen</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Fullscreen</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-dirty">
+                        <property name="label" translatable="yes">Draw only changes</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Draw only changes</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -59,11 +63,11 @@
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-throttle">
+                        <property name="label" translatable="yes">Throttle</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Throttle</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -73,11 +77,11 @@
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-sleepidle">
+                        <property name="label" translatable="yes">Sleep when idle</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Sleep when idle</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -121,11 +125,11 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-autodouble">
+                        <property name="label" translatable="yes">Autodouble</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Autodouble</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -294,23 +298,24 @@
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-ror">
+                        <property name="label" translatable="yes">Rotate right</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Rotate right</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-rol">
+                        <property name="label" translatable="yes">Rotate left</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Rotate left</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -320,11 +325,11 @@
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-norotate">
+                        <property name="label" translatable="yes">Do not apply rotation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Do not apply rotation</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -334,11 +339,11 @@
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-flipy">
+                        <property name="label" translatable="yes">Flip screen upside-down</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Flip screen upside-down</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -348,11 +353,11 @@
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-flipx">
+                        <property name="label" translatable="yes">Flip screen left-right</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Flip screen left-right</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -377,8 +382,8 @@
             <property name="label" translatable="yes">Display Options</property>
           </widget>
           <packing>
-            <property name="type">tab</property>
             <property name="tab_fill">False</property>
+            <property name="type">tab</property>
           </packing>
         </child>
         <child>
@@ -396,6 +401,7 @@
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -424,15 +430,16 @@ Black Scanlines</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-scanlines">
+                        <property name="label" translatable="yes">Use Scanlines</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Use Scanlines</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -479,6 +486,7 @@ Black Scanlines</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -488,7 +496,7 @@ Black Scanlines</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="adjustment">0.5 0.5 2 0.050000000000000003 0.050000000000000003 0</property>
                         <property name="digits">2</property>
-                        <property name="value_pos">GTK_POS_RIGHT</property>
+                        <property name="value_pos">right</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -514,7 +522,7 @@ Black Scanlines</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="adjustment">0.5 0.5 2 0.050000000000000003 0.050000000000000003 0</property>
                         <property name="digits">2</property>
-                        <property name="value_pos">GTK_POS_RIGHT</property>
+                        <property name="value_pos">right</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -540,7 +548,7 @@ Black Scanlines</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="adjustment">0.5 0.5 2 0.050000000000000003 0.050000000000000003 0</property>
                         <property name="digits">2</property>
-                        <property name="value_pos">GTK_POS_RIGHT</property>
+                        <property name="value_pos">right</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -624,11 +632,11 @@ Skip 12 out of 12 frames</property>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Video-autoframeskip">
+                        <property name="label" translatable="yes">Automatic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Automatic</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -684,9 +692,9 @@ Skip 12 out of 12 frames</property>
             <property name="label" translatable="yes">Effects &amp; Corrections</property>
           </widget>
           <packing>
-            <property name="type">tab</property>
             <property name="position">1</property>
             <property name="tab_fill">False</property>
+            <property name="type">tab</property>
           </packing>
         </child>
         <child>
@@ -704,6 +712,7 @@ Skip 12 out of 12 frames</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="padding">6</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -729,6 +738,7 @@ Skip 12 out of 12 frames</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -751,6 +761,7 @@ Skip 12 out of 12 frames</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">6</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -767,7 +778,7 @@ Skip 12 out of 12 frames</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="adjustment">0.5 0.5 3 0.10000000000000001 1 0</property>
                             <property name="digits">2</property>
-                            <property name="value_pos">GTK_POS_RIGHT</property>
+                            <property name="value_pos">right</property>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
@@ -783,7 +794,7 @@ Skip 12 out of 12 frames</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="adjustment">0 0 100 1 10 10</property>
                             <property name="digits">0</property>
-                            <property name="value_pos">GTK_POS_RIGHT</property>
+                            <property name="value_pos">right</property>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
@@ -799,7 +810,7 @@ Skip 12 out of 12 frames</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="adjustment">1 1 16 1 1 1</property>
                             <property name="digits">2</property>
-                            <property name="value_pos">GTK_POS_RIGHT</property>
+                            <property name="value_pos">right</property>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
@@ -855,11 +866,11 @@ Skip 12 out of 12 frames</property>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Vector-antialias">
+                        <property name="label" translatable="yes">Draw antialiased vectors</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Draw antialiased vectors</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -869,11 +880,11 @@ Skip 12 out of 12 frames</property>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Vector-translucency">
+                        <property name="label" translatable="yes">Draw translucent vectors</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Draw translucent vectors</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -900,9 +911,9 @@ Skip 12 out of 12 frames</property>
             <property name="label" translatable="yes">Vector</property>
           </widget>
           <packing>
-            <property name="type">tab</property>
             <property name="position">2</property>
             <property name="tab_fill">False</property>
+            <property name="type">tab</property>
           </packing>
         </child>
         <child>
@@ -919,6 +930,7 @@ Skip 12 out of 12 frames</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="padding">6</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -933,15 +945,16 @@ Skip 12 out of 12 frames</property>
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Artwork-artwork">
+                        <property name="label" translatable="yes">Use additional game artwork:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Use additional game artwork:</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -956,24 +969,25 @@ Skip 12 out of 12 frames</property>
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkCheckButton" id="preferences_Artwork-use_backdrops">
+                                <property name="label" translatable="yes">Backdrops</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Backdrops</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkCheckButton" id="preferences_Artwork-use_bezels">
+                                <property name="label" translatable="yes">Bezels</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Bezels</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
@@ -983,11 +997,11 @@ Skip 12 out of 12 frames</property>
                             </child>
                             <child>
                               <widget class="GtkCheckButton" id="preferences_Artwork-use_overlays">
+                                <property name="label" translatable="yes">Overlays</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Overlays</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
@@ -1016,6 +1030,7 @@ Skip 12 out of 12 frames</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1039,11 +1054,11 @@ High</property>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_Artwork-artwork_crop">
+                        <property name="label" translatable="yes">Crop artwork</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Crop artwork</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -1070,9 +1085,9 @@ High</property>
             <property name="label" translatable="yes">Artwork</property>
           </widget>
           <packing>
-            <property name="type">tab</property>
             <property name="position">3</property>
             <property name="tab_fill">False</property>
+            <property name="type">tab</property>
           </packing>
         </child>
         <child>
@@ -1088,6 +1103,7 @@ High</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1100,14 +1116,15 @@ High</property>
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_OpenGL-gldblbuffer">
+                        <property name="label" translatable="yes">Enable double buffering</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable double buffering</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1122,6 +1139,7 @@ High</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1142,10 +1160,10 @@ High</property>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_OpenGL-glbilinear">
+                        <property name="label" translatable="yes">Enable bilinear filtering</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable bilinear filtering</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -1164,6 +1182,7 @@ High</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1171,7 +1190,7 @@ High</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="adjustment">0 0 100 1 10 10</property>
-                            <property name="value_pos">GTK_POS_RIGHT</property>
+                            <property name="value_pos">right</property>
                           </widget>
                           <packing>
                             <property name="position">1</property>
@@ -1184,10 +1203,10 @@ High</property>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_OpenGL-glantialias">
+                        <property name="label" translatable="yes">Enable antialiasing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable antialiasing</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -1197,11 +1216,11 @@ High</property>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_OpenGL-glantialiasvec">
+                        <property name="label" translatable="yes">Enable vector antialiasing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Enable vector antialiasing</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -1211,10 +1230,10 @@ High</property>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="preferences_OpenGL-cabview">
+                        <property name="label" translatable="yes">Start in cabinet view</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Start in cabinet view</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -1241,9 +1260,9 @@ High</property>
             <property name="label" translatable="yes">OpenGL</property>
           </widget>
           <packing>
-            <property name="type">tab</property>
             <property name="position">4</property>
             <property name="tab_fill">False</property>
+            <property name="type">tab</property>
           </packing>
         </child>
       </widget>
@@ -1263,6 +1282,7 @@ High</property>
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -1276,24 +1296,25 @@ High</property>
                 <property name="spacing">6</property>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_MAME-cheat">
+                    <property name="label" translatable="yes">Enable game cheats</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Enable game cheats</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_MAME-skip_disclaimer">
+                    <property name="label" translatable="yes">Skip disclaimer info</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Skip disclaimer info</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1303,11 +1324,11 @@ High</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_MAME-skip_gameinfo">
+                    <property name="label" translatable="yes">Skip game info</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Skip game info</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1329,6 +1350,7 @@ High</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1361,11 +1383,11 @@ Universe Bios v1.2 (hack)</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_MAME-autosave">
+                    <property name="label" translatable="yes">Enable automatic save/restore</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Enable automatic save/restore</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1375,11 +1397,11 @@ Universe Bios v1.2 (hack)</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_MAME-keyboard_leds">
+                    <property name="label" translatable="yes">Use keyboard LEDs as game indicators</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Use keyboard LEDs as game indicators</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1449,11 +1471,11 @@ Universe Bios v1.2 (hack)</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_File-log">
+                    <property name="label" translatable="yes">Log debug info</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Log debug info</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1488,6 +1510,7 @@ Universe Bios v1.2 (hack)</property>
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -1516,6 +1539,7 @@ Universe Bios v1.2 (hack)</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1524,7 +1548,7 @@ Universe Bios v1.2 (hack)</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="adjustment">3.2999999999999998 1 30 1 1 0</property>
-                        <property name="value_pos">GTK_POS_RIGHT</property>
+                        <property name="value_pos">right</property>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -1563,6 +1587,7 @@ Universe Bios v1.2 (hack)</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1572,7 +1597,7 @@ Universe Bios v1.2 (hack)</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="adjustment">0 -32 0 1 1 0</property>
                         <property name="digits">0</property>
-                        <property name="value_pos">GTK_POS_RIGHT</property>
+                        <property name="value_pos">right</property>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -1629,14 +1654,6 @@ Universe Bios v1.2 (hack)</property>
 /dev/dsp3
 /dev/audio
 /dev/null</property>
-                    <child internal-child="entry">
-                      <widget class="GtkEntry" id="comboboxentry-entry2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="max_length">20</property>
-                      </widget>
-                    </child>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -1652,14 +1669,6 @@ Universe Bios v1.2 (hack)</property>
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="items" translatable="yes">/dev/mixer</property>
-                    <child internal-child="entry">
-                      <widget class="GtkEntry" id="comboboxentry-entry1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="max_length">20</property>
-                      </widget>
-                    </child>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -1714,11 +1723,11 @@ Universe Bios v1.2 (hack)</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Sound-fakesound">
+                    <property name="label" translatable="yes">Fake sound</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Fake sound</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1731,11 +1740,11 @@ Universe Bios v1.2 (hack)</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Sound-samples">
+                    <property name="label" translatable="yes">Use samples</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Use samples</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1748,11 +1757,11 @@ Universe Bios v1.2 (hack)</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Sound-sound">
+                    <property name="label" translatable="yes">Enable sound</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Enable sound</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1885,11 +1894,11 @@ aRTS</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Sound-timer">
+                    <property name="label" translatable="yes">Timer based audio</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Timer based audio</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1928,6 +1937,7 @@ aRTS</property>
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -1950,6 +1960,7 @@ aRTS</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1966,14 +1977,17 @@ SDL joystick</property>
                       </packing>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Input-analogstick">
+                    <property name="label" translatable="yes">Analog joystick</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Analog joystick</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1982,11 +1996,11 @@ SDL joystick</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Input-ugcicoin">
+                    <property name="label" translatable="yes">UGCI (tm) Coin/Play support</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">UGCI (tm) Coin/Play support</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -1995,11 +2009,11 @@ SDL joystick</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Input-steadykey">
+                    <property name="label" translatable="yes">Enable steadykey support</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Enable steadykey support</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -2009,11 +2023,11 @@ SDL joystick</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Input-usbpspad">
+                    <property name="label" translatable="yes">USB PS Game Pads</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">USB PS Game Pads</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -2022,11 +2036,11 @@ SDL joystick</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_Input-rapidfire">
+                    <property name="label" translatable="yes">Rapid-fire</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Rapid-fire</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -2063,19 +2077,22 @@ SDL joystick</property>
                 <property name="spacing">6</property>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_X11Input-grabmouse">
+                    <property name="label" translatable="yes">Select mouse grabbing</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Select mouse grabbing</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_X11Input-grabkeyboard">
+                    <property name="label" translatable="yes">Select keyboard grabbing</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Select keyboard grabbing</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -2084,10 +2101,10 @@ SDL joystick</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_X11Input-alwaysusemouse">
+                    <property name="label" translatable="yes">Always use mouse</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Always use mouse</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -2096,10 +2113,10 @@ SDL joystick</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_X11Input-cursor">
+                    <property name="label" translatable="yes">Show cursor</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Show cursor</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -2108,10 +2125,10 @@ SDL joystick</property>
                 </child>
                 <child>
                   <widget class="GtkCheckButton" id="preferences_X11Input-winkeys">
+                    <property name="label" translatable="yes">Enable mapping of Windows keys</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Enable mapping of Windows keys</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
diff --git a/gmameui.spec b/gmameui.spec
index 4ffc67d..82336a3 100644
--- a/gmameui.spec
+++ b/gmameui.spec
@@ -1,5 +1,5 @@
 Name:      gmameui
-Version:   0.2.9
+Version:   0.2.10
 Release:   1%{?dist}
 Summary:   GMAMEUI is a GTK+ MAME front-end
 URL:       http://gmameui.sourceforge.net/
diff --git a/help/Makefile.in b/help/Makefile.in
index c38db9a..755bc63 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -82,6 +82,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+ARCHIVE_LIBS = @ARCHIVE_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/po/ChangeLog b/po/ChangeLog
index b4c23a4..c7d7672 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,23 @@
+2009-07-02  adburton <adb at iinet.net.au>
+
+	* fr.po: Updated French translation (thanks Loïc Martin)
+	* pt_BR.po: Updated Portugese translation (thanks Junix)
+	* it.po: Updated Italian translation (thanks Ugo Viti)
+
+2009-06-27  adburton <adb at iinet.net.au>
+
+	* POTFILES.in: Removed network_game.c from list of translatable files
+	* LINGUAS, fr.po: New French translation (thanks Loïc Martin)
+
+2009-06-20  adburton <adb at iinet.net.au>
+
+	* POTFILES.in: Replaced unzip.c with gmameui-zip-utils.c
+
+2009-06-11  adburton <adb at iinet.net.au>
+
+	* POTFILES.in: Added data/main_gui.glade and
+	  src/gmameui-search-entry.c for translation
+
 2009-04-01  adburton <adb at iinet.net.au>
 
 	* LINGUAS, sv.po: New Swedish translation (thanks Daniel
diff --git a/po/LINGUAS b/po/LINGUAS
index 6fc660f..948e183 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1,3 @@
 # Set of available languages.
 #af ca de el es fr ga it ja nl pl ro ru sk sr sv tr uk vi zh_CN zh_TW
-en_AU pt_BR it sv
+en_AU pt_BR it sv fr
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c7e8302..402a25f 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ce78158..09aec37 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,6 +12,7 @@ src/gmameui-audit-dlg.c
 src/gmameui-gamelist-view.c
 src/gmameui-sidebar.c
 src/gmameui-rominfo-dlg.c
+src/gmameui-search-entry.c
 src/gtkjoy.c
 src/gui.c
 src/gui.h
@@ -27,17 +28,17 @@ src/mame_options.c
 src/mame_options_dialog.c
 src/mame_options_legacy.c
 src/mame_options_legacy_dialog.c
-src/network_game.c
 src/options_string.c
 src/progression_window.c
 src/rom_entry.c
 src/rom_entry.h
-src/unzip.c
+src/gmameui-zip-utils.c
 src/xmame_options.c
 src/gmameui-ui.xml
 data/audit_window.glade
 data/directories.glade
 data/gmameui_prefs.glade
+data/main_gui.glade
 data/options.glade
 data/options_legacy.glade
 data/properties.glade
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..6a8d8b6
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,3066 @@
+# GMAMEUI is a GTK+ MAME front-end
+# Copyright (C) 2007-2008 Andrew Burton
+# This file is distributed under the same license as the gmameui package.
+# Loïc Martin <loic.martin3 at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GMAMEUI 0.2.9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-27 12:29+0200\n"
+"PO-Revision-Date: 2009-06-27 10:34+1000\n"
+"Last-Translator: Loïc Martin <loic.martin3 at gmail.com>\n"
+"Language-Team: Loïc Martin <loic.martin3 at gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/about.c:50
+msgid "translator-credits"
+msgstr "Loïc Martin"
+
+#: ../src/about.c:58 ../src/about.c:237
+msgid "Copyright (c) 2007-2009 Andrew Burton"
+msgstr "Copyright (c) 2007-2009 Andrew Burton"
+
+#: ../src/about.c:60 ../src/about.c:233
+msgid "A program to play MAME under Linux"
+msgstr "Un programme pour jouer à MAME sous Linux"
+
+#: ../src/about.c:105 ../src/about.c:207
+msgid "Credits"
+msgstr "Crédits"
+
+#: ../src/about.c:121
+msgid "Developers"
+msgstr "Développeurs"
+
+#: ../src/about.c:122
+msgid ""
+"Andrew Burton\n"
+"Code based on GXMame\n"
+"Stephane Pontier <shadow_walker at users.sourceforge.net>\n"
+"Benoit Dumont <vertigo17 at users.sourceforge.net>\n"
+"Nicos Panayides <anarxia at gmx.net>\n"
+"Priit Laes <x-laes at users.sourceforge.net>\n"
+"William Jon McCann <mccann at jhu.edu>\n"
+msgstr ""
+"Andrew Burton\n"
+"Code basé sur GXMame\n"
+"Stephane Pontier <shadow_walker at users.sourceforge.net>\n"
+"Benoit Dumont <vertigo17 at users.sourceforge.net>\n"
+"Nicos Panayides <anarxia at gmx.net>\n"
+"Priit Laes <x-laes at users.sourceforge.net>\n"
+"William Jon McCann <mccann at jhu.edu>\n"
+
+#: ../src/about.c:133
+msgid "Translators"
+msgstr "Traducteurs"
+
+#: ../src/about.c:134
+msgid ""
+"The following people translated GMAMEUI:\n"
+"Brazilian Portugese (pt_BR) - Alfredo Jr <junix at linuxinabox.org>\n"
+"Italian (it) - Ugo Viti <ugo.viti at initzero.it>\n"
+"Swedish (sv) - Daniel Nylander <dnylander at users.sourceforge.net>\n"
+"French (fr) - Loïc Martin <loic.martin3 at gmail.com>"
+msgstr ""
+"Les personnes suivantes ont traduit GMAMEUI:\n"
+"Portugais du Brésil (pt_BR) - Alfredo Jr <junix at linuxinabox.org>\n"
+"Italien (it) - Ugo Viti <ugo.viti at initzero.it>\n"
+"Suédois (sv) - Daniel Nylander <dnylander at users.sourceforge.net>\n"
+"Français (fr) - Loïc Martin <loic.martin3 at gmail.com>"
+
+#: ../src/about.c:203
+msgid "About GMAMEUI"
+msgstr "À propos de GMAMEUI"
+
+#: ../src/about.c:225
+msgid "GMAMEUI"
+msgstr "GMAMEUI"
+
+#: ../src/audit.c:556
+msgid "Don't know how to verify roms with this version of xmame."
+msgstr "Impossible de vérifier les roms avec cetter version de xmame"
+
+#. Add each of the notebooks
+#: ../src/callbacks.c:136 ../src/mame_options_legacy_dialog.c:822
+#: ../data/properties.glade.h:75
+msgid "Display"
+msgstr "Affichage"
+
+#: ../src/callbacks.c:138 ../data/options_legacy.glade.h:131
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#. mame_options_legacy_dialog_add_page (dlg, "OpenGLVBox", _("OpenGL"), "gmameui-display-toolbar");
+#: ../src/callbacks.c:140 ../src/interface.c:621
+#: ../src/mame_options_legacy_dialog.c:824 ../data/properties.glade.h:136
+msgid "Sound"
+msgstr "Son"
+
+#: ../src/callbacks.c:142 ../src/mame_options_legacy_dialog.c:825
+msgid "Input"
+msgstr "Entrées"
+
+#: ../src/callbacks.c:144
+msgid "Performance"
+msgstr "Performance"
+
+#. mame_options_legacy_dialog_add_page (dlg, "PerformanceVBox", _("Performance"), "gmameui-general-toolbar");
+#: ../src/callbacks.c:146 ../src/mame_options_legacy_dialog.c:827
+#: ../data/properties.glade.h:115
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#. FIXME: Make the debugging page last
+#: ../src/callbacks.c:148 ../src/mame_options_dialog.c:129
+#: ../src/mame_options_dialog.c:132 ../src/mame_options_legacy_dialog.c:721
+#: ../src/mame_options_legacy_dialog.c:724
+msgid "Debugging"
+msgstr "Déboguage"
+
+#: ../src/callbacks.c:200
+msgid "No xmame executables defined"
+msgstr "Aucun exécutable xmame défini"
+
+#: ../src/callbacks.c:326
+msgid "GMAMEUI Help could not be started"
+msgstr "L'Aide de GMAMEUI n'a pas pu être lancée"
+
+#: ../src/callbacks.c:328
+msgid ""
+"The Help file could not be opened. This will happen if the version of GTK is "
+"not at least 2.13 and libgnome support has not been compiled in."
+msgstr ""
+"Impossible d'ouvrir le fichier d'Aide. Cela arrive si la version de GTKn'est "
+"pas au minimum 2.13 et que le support libgnome n'a pas été inclus à la "
+"compilation."
+
+#: ../src/callbacks.c:339
+msgid "There was an error opening the Help file"
+msgstr "Erreur à l'ouverture du fichier d'Aide"
+
+#: ../src/cell-renderer-captioned-image.c:215
+msgid "Text"
+msgstr "Texte"
+
+#: ../src/cell-renderer-captioned-image.c:216
+msgid "Text to render"
+msgstr "Texte à afficher"
+
+#: ../src/cell-renderer-captioned-image.c:222
+msgid "Pixbuf Object"
+msgstr "Object pixbuf"
+
+#: ../src/cell-renderer-captioned-image.c:223
+msgid "The pixbuf to render."
+msgstr "Le pixbuf à afficher."
+
+#: ../src/directories.c:338 ../data/directories.glade.h:12
+msgid "Directories Selection"
+msgstr "Choix des répertoires"
+
+#: ../src/directories.c:374
+msgid "No MAME executables have been chosen"
+msgstr "Aucun exécutable MAME n'a été choisi"
+
+#: ../src/directories.c:377
+msgid ""
+"Without a MAME executable, you will not be able to emulate any ROMs. Are you "
+"sure you want to close the window?"
+msgstr ""
+"Sans exécutable MAME, vous ne parviendrez pas à émuler de ROM.Êtes-vous sûr "
+"que vous voulez fermer la fenêtre?"
+
+#: ../src/directories.c:388
+msgid "No ROM directories have been chosen"
+msgstr "Aucun répertoire de ROM n'a été choisi"
+
+#: ../src/directories.c:391
+msgid ""
+"Without any ROM directories, you will not be able to emulate any ROMs. Are "
+"you sure you want to close the window?"
+msgstr ""
+"Sans répertoire de ROM, vous ne parviendrez pas à émuler de ROM.Êtes-vous "
+"sûr que vous voulez fermer la fenêtre?"
+
+#: ../src/directories.c:473
+msgid "Browse for Folder"
+msgstr "Naviguer jusqu'au répertoire"
+
+#: ../src/directories.c:519
+msgid "Browse for File"
+msgstr "Naviguer jusqu'au fichier"
+
+#. Create new directory file chooser
+#: ../src/directories.c:556
+msgid "Select directory"
+msgstr "Choisir le répertoire"
+
+#. Create new directory file chooser
+#: ../src/directories.c:608
+msgid "Select MAME executable"
+msgstr "Choisir l'exécutable MAME"
+
+#. Now add the categories
+#: ../src/filters_list.c:202 ../src/interface.c:599 ../src/interface.c:600
+#: ../src/interface.c:601
+msgid "Available"
+msgstr "Disponible"
+
+#: ../src/filters_list.c:203 ../src/interface.c:604 ../src/interface.c:605
+#: ../src/interface.c:606
+msgid "Status"
+msgstr "Status"
+
+#: ../src/filters_list.c:204 ../src/interface.c:609 ../src/interface.c:610
+#: ../src/interface.c:611 ../src/interface.c:612 ../src/interface.c:613
+#: ../src/interface.c:614 ../src/interface.c:615 ../src/interface.c:616
+msgid "Architecture"
+msgstr "Architecture"
+
+#: ../src/filters_list.c:205 ../src/interface.c:619 ../src/interface.c:620
+#: ../src/interface.c:621 ../src/interface.c:622
+msgid "Imperfect"
+msgstr "Imparfait"
+
+#: ../src/filters_list.c:206 ../src/interface.c:625 ../src/interface.c:626
+#: ../src/interface.c:627 ../src/interface.c:628 ../src/interface.c:629
+#: ../src/interface.c:630 ../src/interface.c:633 ../src/interface.c:634
+msgid "Game Details"
+msgstr "Détails du jeu"
+
+#: ../src/filters_list.c:207 ../src/interface.c:637 ../src/interface.c:638
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: ../src/filters_list.c:208 ../src/gmameui-gamelist-view.c:466
+#: ../src/interface.c:701 ../src/mame_options_dialog.c:80
+#: ../src/mame_options_legacy_dialog.c:672 ../data/gmameui_prefs.glade.h:5
+msgid "Category"
+msgstr "Catégorie"
+
+#: ../src/filters_list.c:209 ../src/gmameui-gamelist-view.c:464
+#: ../src/interface.c:722 ../data/gmameui_prefs.glade.h:19
+msgid "Version"
+msgstr "Version"
+
+#: ../src/game_list.c:342
+#, c-format
+msgid "Loading gamelist %s"
+msgstr "Chargement de la liste de jeux %s"
+
+#: ../src/game_list.c:374
+msgid "Game list is corrupted."
+msgstr "Liste de jeux corrompue."
+
+#: ../src/game_list.c:386
+msgid "Out of memory while loading gamelist"
+msgstr "Mémoire insuffisante au chargement de la liste de jeux"
+
+#: ../src/game_list.c:507
+#, c-format
+msgid "Loaded %d roms by %d manufacturers covering %d years."
+msgstr "Chargé %d roms par %d fabricants sur %d années"
+
+#: ../src/game_list.c:509
+#, c-format
+msgid "with %d games supporting samples."
+msgstr "dont %d jeux supportant des samples."
+
+#: ../src/game_list.c:651
+msgid "Saving gamelist."
+msgstr "Sauvegarde de la liste de jeux."
+
+#: ../src/game_list.c:757
+msgid ""
+"Could not recognise the gamelist version.\n"
+"Do you want to rebuild the gamelist?"
+msgstr ""
+"Impossible de reconnaître la version de la liste de jeux.\n"
+"Voulez-vous la reconstruire?"
+
+#: ../src/game_list.c:766
+msgid ""
+"Gamelist not available,\n"
+"Do you want to build the gamelist?"
+msgstr ""
+"Liste de jeux non disponible.\n"
+"Voulez-vous la reconstruire?"
+
+#: ../src/game_list.c:775
+msgid ""
+"Gamelist was created with an older version of GMAMEUI.\n"
+"The gamelist is not supported.\n"
+"Do you want to rebuild the gamelist?"
+msgstr ""
+"La liste de jeux a été créée par une version antérieure de GAMEUI.\n"
+"La liste de jeux n'est pas supportée.\n"
+"Voulez-vous la reconstruire?"
+
+#: ../src/game_list.c:788
+#, c-format
+msgid ""
+"The gamelist is from:\n"
+"%s %s\n"
+"and the current executable is:\n"
+"%s %s\n"
+"Do you want to rebuild the gamelist?"
+msgstr ""
+"La liste de jeux est de:\n"
+"%s %s\n"
+"et l'exécutable actuel est:\n"
+"%s %s\n"
+"Voulez-vous reconstruire la liste de jeux?"
+
+#: ../src/gmameui.c:97
+msgid "No MAME executables were found"
+msgstr "Impossible de trouver un exécutable MAME"
+
+#: ../src/gmameui.c:99
+msgid "Do you want to locate a MAME executable now?"
+msgstr "Voulez-vous localiser un exécutable MAME maintenant?"
+
+#: ../src/gmameui.c:156
+msgid "Initialising list of possible MAME executable options"
+msgstr "Initialisation de la liste d'options possibles de l'exécutable MAME"
+
+#: ../src/gmameui.c:159
+msgid "Initialising MAME executables"
+msgstr "Initialisation des exécutables MAME"
+
+#: ../src/gmameui.c:174
+#, c-format
+msgid "Adding executable from preferences file: %s"
+msgstr "Ajout d'exécutable depuis le fichier de préférences: %s"
+
+#: ../src/gmameui.c:197
+#, c-format
+msgid "Time to initialise: %.02f seconds"
+msgstr "Temps d'initialisation: %.02f secondes"
+
+#: ../src/gmameui.c:206
+msgid "gamelist not found, need to rebuild one"
+msgstr "Liste de jeux non trouvée, il faut en reconstruire une"
+
+#: ../src/gmameui.c:210
+#, c-format
+msgid "Time to load gamelist: %.02f seconds"
+msgstr "Temps de chargement de la liste de jeux: %.02f secondes"
+
+#: ../src/gmameui.c:213
+msgid "games.ini not loaded, using default values"
+msgstr "games.ini non chargé, utilisation de valeurs par défaut"
+
+#: ../src/gmameui.c:216
+#, c-format
+msgid "Time to load games ini: %.02f seconds"
+msgstr "Temps de chargement de l'ini games: %.02f secondes"
+
+#: ../src/gmameui.c:219
+msgid "catver not loaded, using default values"
+msgstr "catver non chargé, utilisation de valeurs par défaut"
+
+#: ../src/gmameui.c:224
+#, c-format
+msgid "Time to initialise GMAMEUI: %.02f seconds"
+msgstr "Temps d'initialisation de GMAMEUI: %.02f secondes"
+
+#: ../src/gmameui.c:239
+#, c-format
+msgid "Joystick %s found"
+msgstr "Joystick %s trouvé"
+
+#: ../src/gmameui.c:241
+msgid "No Joystick found"
+msgstr "Aucun joystick trouvé"
+
+#: ../src/gmameui.c:465 ../src/gmameui.c:473
+#, c-format
+msgid "Loading %s:"
+msgstr "Chargement de %s:"
+
+#: ../src/gmameui.c:563
+#, c-format
+msgid "Error with MAME graphics creation: %s"
+msgstr "Erreur lors de la création des graphiques par MAME: %s"
+
+#: ../src/gmameui.c:586
+msgid "GMAMEUI could not load the ROM"
+msgstr "GMAMEUI n'a pas pu charger la ROM"
+
+#: ../src/gmameui.c:587
+msgid "The following ROMs were not found:\n"
+msgstr "Les ROM suivantes n'ont pas été trouvées:\n"
+
+#: ../src/gmameui.c:589
+msgid "MAME did not start successfully"
+msgstr "MAME n'a pas réussi à se lancer"
+
+#: ../src/gmameui.c:590
+msgid "The following errors were reported:\n"
+msgstr "Les erreurs suivantes ont été rapportées:\n"
+
+#: ../src/gmameui.c:779
+#, c-format
+msgid "Could not open '%s' as valid input file"
+msgstr "Impossible d'ouvrir '%s' comme fichier d'entrée valide"
+
+#: ../src/gmameui.c:825
+msgid "Exiting GMAMEUI..."
+msgstr "Fermeture de GMAMEUI"
+
+#. FIXME TODO gtk_widget_destroy (MainWindow);
+#: ../src/gmameui.c:858
+msgid "Finished cleaning up GMAMEUI"
+msgstr "Fin de nettoyage de GMAMEUI"
+
+#: ../src/gmameui-audit-dlg.c:221 ../data/audit_window.glade.h:5
+msgid "Auditing MAME ROMs"
+msgstr "Audit des ROM MAME"
+
+#: ../src/gmameui-audit-dlg.c:274 ../data/audit_window.glade.h:6
+msgid "Auditing ROMs"
+msgstr "Audit des ROM"
+
+#: ../src/gmameui-audit-dlg.c:316
+msgid "Audit Stopped"
+msgstr "Arrêt de l'audit"
+
+#: ../src/gmameui-audit-dlg.c:317
+msgid "Stopped"
+msgstr "Stoppé"
+
+#: ../src/gmameui-audit-dlg.c:444
+#, c-format
+msgid "Auditing romset %s"
+msgstr "Audit du romset %s"
+
+#: ../src/gmameui-audit-dlg.c:455
+#, c-format
+msgid "Auditing sampleset %s"
+msgstr "Audit du sampleset %s"
+
+#: ../src/gmameui-audit-dlg.c:507 ../src/gmameui-audit-dlg.c:510
+msgid "Audit done"
+msgstr "Audit effectué"
+
+#: ../src/gmameui-audit-dlg.c:508
+msgid "Done"
+msgstr "Fait"
+
+#: ../src/gmameui-gamelist-view.c:430
+msgid "Game"
+msgstr "Jeu"
+
+#: ../src/gmameui-gamelist-view.c:432 ../data/directories.glade.h:23
+msgid "ROMs"
+msgstr "ROMs"
+
+#: ../src/gmameui-gamelist-view.c:434 ../src/interface.c:627
+#: ../data/directories.glade.h:24 ../data/gmameui_prefs.glade.h:16
+msgid "Samples"
+msgstr "Samples"
+
+#: ../src/gmameui-gamelist-view.c:436 ../data/gmameui_prefs.glade.h:7
+msgid "Directory"
+msgstr "Répertoire"
+
+#: ../src/gmameui-gamelist-view.c:438 ../src/interface.c:638
+msgid "Played"
+msgstr "Joué"
+
+#: ../src/gmameui-gamelist-view.c:440 ../data/gmameui_prefs.glade.h:13
+msgid "Manufacturer"
+msgstr "Fabricant"
+
+#: ../src/gmameui-gamelist-view.c:442 ../data/gmameui_prefs.glade.h:21
+msgid "Year"
+msgstr "Année"
+
+#: ../src/gmameui-gamelist-view.c:444 ../data/gmameui_prefs.glade.h:6
+msgid "Clone of"
+msgstr "Clone de"
+
+#. Imperfect filters
+#: ../src/gmameui-gamelist-view.c:446 ../src/interface.c:619
+#: ../data/gmameui_prefs.glade.h:8
+msgid "Driver"
+msgstr "Pilote"
+
+#: ../src/gmameui-gamelist-view.c:448
+msgid "Rom of"
+msgstr "Rom de"
+
+#: ../src/gmameui-gamelist-view.c:452
+msgid "Driver Status"
+msgstr "Status du pilote"
+
+#: ../src/gmameui-gamelist-view.c:454
+msgid "Driver Colors"
+msgstr "Couleurs du pilote"
+
+#: ../src/gmameui-gamelist-view.c:456
+msgid "Driver Sound"
+msgstr "Son du pilote"
+
+#: ../src/gmameui-gamelist-view.c:458
+msgid "Driver Graphics"
+msgstr "Graphismes du pilote"
+
+#: ../src/gmameui-gamelist-view.c:460
+msgid "Players"
+msgstr "Joueurs"
+
+#: ../src/gmameui-gamelist-view.c:462
+msgid "Buttons"
+msgstr "Boutons"
+
+#: ../src/gmameui-gamelist-view.c:468
+msgid "Favorite"
+msgstr "Favori"
+
+#: ../src/gmameui-gamelist-view.c:470
+msgid "Channels"
+msgstr "Canaux"
+
+#: ../src/gmameui-gamelist-view.c:472 ../src/interface.c:616
+msgid "BIOS"
+msgstr "BIOS"
+
+#: ../src/gmameui-gamelist-view.c:592 ../src/gmameui-gamelist-view.c:1466
+msgid "Yes"
+msgstr "Oui"
+
+#: ../src/gmameui-gamelist-view.c:592 ../src/gmameui-gamelist-view.c:1466
+msgid "No"
+msgstr "Non"
+
+#: ../src/gmameui-gamelist-view.c:682
+msgid "game"
+msgstr "jeu"
+
+#: ../src/gmameui-gamelist-view.c:682
+msgid "games"
+msgstr "jeux"
+
+#: ../src/gmameui-gamelist-view.c:704
+msgid "Wait..."
+msgstr "Attendez..."
+
+#: ../src/gmameui-gamelist-view.c:1079
+#, c-format
+msgid "Hide \"%s\" Column"
+msgstr "Cache la colonne \"%s\""
+
+#: ../src/gmameui-rominfo-dlg.c:68 ../src/gmameui-rominfo-dlg.c:71
+msgid "Can't audit game"
+msgstr "Impossible d'effectuer l'audit du jeu"
+
+#: ../src/gmameui-rominfo-dlg.c:73 ../src/gmameui-rominfo-dlg.c:299
+msgid "None required"
+msgstr "Pas nécessaire"
+
+#: ../src/gmameui-rominfo-dlg.c:103 ../src/interface.c:606
+#: ../src/rom_entry.h:85
+msgid "Incorrect"
+msgstr "Incorrect"
+
+#: ../src/gmameui-rominfo-dlg.c:104
+msgid "Passed"
+msgstr "Passé"
+
+#: ../src/gmameui-rominfo-dlg.c:105 ../src/io.c:250 ../src/io.c:253
+#: ../src/rom_entry.c:478 ../src/rom_entry.c:481 ../src/rom_entry.c:559
+#: ../src/rom_entry.c:562 ../src/rom_entry.h:87
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../src/gmameui-rominfo-dlg.c:107
+msgid "Best available"
+msgstr "Meilleur disponible"
+
+#: ../src/gmameui-rominfo-dlg.c:108
+msgid "Not available"
+msgstr "Non disponible"
+
+#: ../src/gmameui-rominfo-dlg.c:268
+#, c-format
+msgid "%i colors"
+msgstr "%i couleurs"
+
+#: ../src/gmameui-rominfo-dlg.c:296
+msgid "Checking..."
+msgstr "Vérification..."
+
+#: ../src/gmameui-search-entry.c:128
+msgid "Clear the search text"
+msgstr "Enlève le texte recherché"
+
+#: ../src/gui.c:80
+#, c-format
+msgid "Time to initialise icons: %.02f seconds"
+msgstr "Temps d'initialisation des icônes: %.02f secondes"
+
+#: ../src/gui.c:87
+#, c-format
+msgid "Time to create main window, filters and gamelist: %.02f seconds"
+msgstr ""
+"Temps de création de la fenêtre principale, des filtres et de la liste de "
+"jeux: %.02f secondes"
+
+#: ../src/gui.c:114
+#, c-format
+msgid "Time to complete start of UI: %.02f seconds"
+msgstr "Temps de démarrage complet de l'UI: %.02f seconds"
+
+#: ../src/gui.c:137
+msgid "Do you want to rebuild the gamelist?"
+msgstr "Voulez-vous reconstruire la liste de jeu?"
+
+#: ../src/gui.c:139
+msgid ""
+"The selected MAME executable has changed, so the list of supported ROMs will "
+"have changed. It is recommended that you rebuild the gamelist. Do you want "
+"to rebuild now?"
+msgstr ""
+"L'exécutable MAME sélectionné a changé, la liste des ROM supportées a donc "
+"changé.La reconstruction de la liste de jeux est recommandée. Voulez-vous le "
+"faire maintenant?"
+
+#: ../src/gui.c:141
+msgid "Rebuild gamelist"
+msgstr "Reconstruction de la liste de jeux"
+
+#: ../src/gui.c:147
+msgid "Executable is not valid MAME executable... skipping"
+msgstr "L'exécutable n'est pas un exécutable MAME valide... ignoré"
+
+#: ../src/gui.c:234
+msgid "No executables"
+msgstr "Aucun exécutable"
+
+#. update statusbar
+#: ../src/gui.c:770
+msgid "No game selected"
+msgstr "Aucun jeu sélectionné"
+
+#: ../src/gui.c:800
+msgid "Choose inp file to play"
+msgstr "Choisissez un fichier inp à jouer"
+
+#: ../src/gui.c:829
+msgid "File exists"
+msgstr "Le fichier existe"
+
+#: ../src/gui.c:831
+#, c-format
+msgid "A file named '%s' already exists. Do you want to overwrite it?"
+msgstr "Un fichier nommé '%s' existe déjà. Voulez-vous l'écraser?"
+
+#. Toplevel
+#: ../src/gui.h:54
+msgid "_File"
+msgstr "_Fichier"
+
+#: ../src/gui.h:55
+msgid "_View"
+msgstr "_Voir"
+
+#: ../src/gui.h:56
+msgid "_Options"
+msgstr "_Options"
+
+#: ../src/gui.h:57
+msgid "_Help"
+msgstr "_Aide"
+
+#. File menu
+#: ../src/gui.h:60
+msgid "_Select Random Game"
+msgstr "_Sélectionner un jeu au hasard"
+
+#: ../src/gui.h:61 ../src/gui.h:88
+msgid "Play currently selected game"
+msgstr "Jouer le jeu sélectionné"
+
+#: ../src/gui.h:62
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: ../src/gui.h:63
+msgid "Quit GMAMEUI"
+msgstr "Quitter GMAMEUI"
+
+#. View menu
+#: ../src/gui.h:66
+msgid "Refresh"
+msgstr "Actualiser"
+
+#: ../src/gui.h:67
+msgid "Refresh game list"
+msgstr "Actualiser la liste de jeux"
+
+#. Option menu
+#: ../src/gui.h:70
+msgid "_Directories..."
+msgstr "_Répertoires..."
+
+#: ../src/gui.h:71
+msgid "Set directory configuration"
+msgstr "Définir les répertoires"
+
+#: ../src/gui.h:72
+msgid "_GMAMEUI Preferences..."
+msgstr "_Préférences de GMAMEUI"
+
+#: ../src/gui.h:73
+msgid "Set GMAMEUI preferences"
+msgstr "Définir les préférences de GMAMEUI"
+
+#. Help menu
+#: ../src/gui.h:76
+msgid "_Contents"
+msgstr "_Contenus"
+
+#: ../src/gui.h:77
+msgid "Open the GMAMEUI manual"
+msgstr "Ouvrir le manuel de GMAMEUI"
+
+#: ../src/gui.h:79
+msgid "About this application"
+msgstr "À propos de cette application"
+
+#. File menu
+#: ../src/gui.h:87
+msgid "Play"
+msgstr "Jouer"
+
+#: ../src/gui.h:89
+msgid "Play and Record Input..."
+msgstr "Jouer et enregistrer les commandes..."
+
+#: ../src/gui.h:90
+msgid "Record a game for later playback"
+msgstr "Enregistrer un jeu pour y rejouer plus tard"
+
+#: ../src/gui.h:91
+msgid "Playback Input..."
+msgstr "Rejouer les commandes..."
+
+#: ../src/gui.h:92
+msgid "Playback a recorded game"
+msgstr "Rejouer un jeu enregistré"
+
+#: ../src/gui.h:93
+msgid "Options"
+msgstr "Options"
+
+#: ../src/gui.h:94
+msgid "Change the options of the selected game"
+msgstr "Changer les options pour le jeu sélectionné"
+
+#: ../src/gui.h:100
+msgid "_Audit All Games"
+msgstr "_Lancer l'audit de tous les jeux"
+
+#: ../src/gui.h:101
+msgid "Audit ROM and sample sets"
+msgstr "Auditer les ROM et les jeux de samples"
+
+#: ../src/gui.h:102
+msgid "_Rebuild Game List"
+msgstr "_Reconstruire la liste des jeux"
+
+#: ../src/gui.h:103
+msgid "Rebuild the game list from executable information"
+msgstr "Reconstruire la liste des jeux selon les informations de l'exécutable"
+
+#: ../src/gui.h:104
+msgid "Default _Options..."
+msgstr "_Options par défaut..."
+
+#: ../src/gui.h:105
+msgid "Set default game options"
+msgstr "Définir les options de jeu par défaut"
+
+#: ../src/gui.h:111
+msgid "Properties"
+msgstr "Propriétés"
+
+#: ../src/gui.h:112
+msgid "Display the properties of the selected game"
+msgstr "Afficher les propriétés du jeu sélectionné"
+
+#: ../src/gui.h:117
+msgid "Add to 'Favorites'"
+msgstr "Ajouter aux 'Favoris'"
+
+#: ../src/gui.h:118
+msgid "Add this game to your 'Favorites' game folder"
+msgstr "Ajouter ce jeu à votre répertoire de jeux 'Favoris'"
+
+#: ../src/gui.h:119
+msgid "Remove from 'Favorites'"
+msgstr "Enlever des 'Favoris'"
+
+#: ../src/gui.h:120
+msgid "Remove this game from your 'Favorites' game folder"
+msgstr "Enlever ce jeu de votre répertoire de jeux 'Favoris'"
+
+#: ../src/gui.h:127
+msgid "Expand All"
+msgstr "Tout développer"
+
+#: ../src/gui.h:128
+msgid "Expand all rows"
+msgstr "Développer toutes les lignes"
+
+#: ../src/gui.h:129
+msgid "Collapse All"
+msgstr "Tout réduire"
+
+#: ../src/gui.h:130
+msgid "Collapse all rows"
+msgstr "Réduire toutes les lignes"
+
+#: ../src/gui.h:135
+msgid "_Toolbar"
+msgstr "Barre d'_Outils"
+
+#: ../src/gui.h:136
+msgid "Show or hide the toolbar"
+msgstr "Afficher ou cacher la barre d'outils"
+
+#: ../src/gui.h:138
+msgid "_Status Bar"
+msgstr "Barre d'_Etat"
+
+#: ../src/gui.h:139
+msgid "Show or hide the status bar"
+msgstr "Afficher ou cacher la barre d'état"
+
+#: ../src/gui.h:141
+msgid "Fold_er List"
+msgstr "Liste des _Répertoires"
+
+#: ../src/gui.h:142
+msgid "Show or hide the folder list"
+msgstr "Afficher ou cacher la liste des répertoires"
+
+#: ../src/gui.h:144
+msgid "Scree_nshot Panel"
+msgstr "Panneau de _Captures d'écran"
+
+#: ../src/gui.h:145
+msgid "Show or hide the screenshot panel"
+msgstr "Afficher ou cacher le panneau de captures d'écran"
+
+#: ../src/gui.h:151
+msgid "_List"
+msgstr "_Liste"
+
+#: ../src/gui.h:152
+msgid "Displays items in a list"
+msgstr "Affiche les items sous une liste"
+
+#: ../src/gui.h:154
+msgid "List _Tree"
+msgstr "Liste à _Arborescence"
+
+#: ../src/gui.h:155
+msgid "Displays items in a tree list with clones indented"
+msgstr ""
+"Affiche la liste des items sous une liste à arborescence à clones indentés"
+
+#: ../src/gui.h:157
+msgid "_Details"
+msgstr "_Détails"
+
+#: ../src/gui.h:158
+msgid "Displays detailed information about each item"
+msgstr "Affiche des informations détaillées pour chaque item"
+
+#: ../src/gui.h:160
+msgid "Detai_ls Tree"
+msgstr "Déta_Is à arborescence"
+
+#: ../src/gui.h:161
+msgid "Displays detailed information about each item with clones indented"
+msgstr ""
+"Affiche des informations détaillées pour chaque item avec des clones indentés"
+
+#: ../src/gui.h:167 ../src/gui.h:168
+msgid "Hide Column"
+msgstr "Cacher la colonne"
+
+#: ../src/gui_prefs.c:1041
+#, c-format
+msgid "Retrieving default boolean value for %s: %i"
+msgstr "Récupération de la valeur boléenne par défaut pour %s: %i"
+
+#: ../src/gui_prefs.c:1070
+#, c-format
+msgid "Retrieving default integer value for %s: %i"
+msgstr "Récupération de la valeur entier par défaut pour %s: %i"
+
+#: ../src/gui_prefs.c:1099 ../src/mame_options_legacy.c:635
+#, c-format
+msgid "Retrieving default string value for %s: %s"
+msgstr "Récupération de la valeur par défaut du string pour %s: %s"
+
+#: ../src/gui_prefs_dialog.c:243 ../data/gmameui_prefs.glade.h:10
+msgid "GMAMEUI Preferences"
+msgstr "Préférences de GMAMEUI"
+
+#: ../src/interface.c:387
+msgid "GMAMEUI Arcade Machine Emulator"
+msgstr "GMAMEUI Émulateur de Machine d'Arcade"
+
+#. Availability-related filters
+#: ../src/interface.c:599 ../data/main_gui.glade.h:1
+msgid "All ROMs"
+msgstr "Toutes les ROM"
+
+#: ../src/interface.c:601
+msgid "Unavailable"
+msgstr "Non disponible"
+
+#. Status-related filters
+#: ../src/interface.c:604 ../src/rom_entry.h:86
+msgid "Correct"
+msgstr "Correct"
+
+#: ../src/interface.c:605 ../src/rom_entry.h:89
+msgid "Best Available"
+msgstr "Meilleur disponible"
+
+#. Architecture-related filters
+#: ../src/interface.c:609
+msgid "Neo-Geo"
+msgstr "Neo-Geo"
+
+#: ../src/interface.c:610
+msgid "CPS1"
+msgstr "CPS1"
+
+#: ../src/interface.c:611
+msgid "CPS2"
+msgstr "CPS2"
+
+#: ../src/interface.c:612
+msgid "CPS3"
+msgstr "CPS3"
+
+#: ../src/interface.c:613
+msgid "Sega System 16"
+msgstr "Sega System 16"
+
+#: ../src/interface.c:614
+msgid "Sega Model 2"
+msgstr "Sega Model 2"
+
+#: ../src/interface.c:615
+msgid "Namco System 22"
+msgstr "Namco System 22"
+
+#: ../src/interface.c:620
+msgid "Colors"
+msgstr "Couleurs"
+
+#: ../src/interface.c:622
+msgid "Graphics"
+msgstr "Graphismes"
+
+#. Game Details filters
+#: ../src/interface.c:625
+msgid "Originals"
+msgstr "Originaux"
+
+#: ../src/interface.c:626
+msgid "Clones"
+msgstr "Clones"
+
+#: ../src/interface.c:628
+msgid "Stereo"
+msgstr "Stéréo"
+
+#: ../src/interface.c:629
+msgid "Raster"
+msgstr "Raster"
+
+#: ../src/interface.c:630 ../data/options.glade.h:148
+#: ../data/options_legacy.glade.h:157 ../data/properties.glade.h:154
+msgid "Vector"
+msgstr "Vectoriel"
+
+#. TODO		{ ORIENTATION, FILTER_ORIENTATION_V, _("Vertical"), TRUE, "vertical", 0, TRUE, NULL, _("Game Details") },
+#. { ORIENTATION, FILTER_ORIENTATION_H, _("Horizontal"), TRUE, "horizontal", 0, TRUE, NULL, _("Game Details") },
+#: ../src/interface.c:633
+msgid "Trackball"
+msgstr "Trackball"
+
+#: ../src/interface.c:634
+msgid "Lightgun"
+msgstr "Pistolet"
+
+#. Custom filters
+#: ../src/interface.c:637
+msgid "Favorites"
+msgstr "Favoris"
+
+#: ../src/interface.h:72
+msgid "Play Game"
+msgstr "Lancer le jeu"
+
+#: ../src/interface.h:73
+msgid "Show Folders"
+msgstr "Afficher les répertoires"
+
+#: ../src/interface.h:74
+msgid "Show Sidebar"
+msgstr "Afficher le panneau latéral"
+
+#: ../src/interface.h:75
+msgid "List"
+msgstr "Liste"
+
+#: ../src/interface.h:77
+msgid "List Tree"
+msgstr "Liste à arborescence"
+
+#: ../src/interface.h:79 ../data/audit_window.glade.h:10
+#: ../data/properties.glade.h:72 ../data/rom_info.glade.h:8
+msgid "Details"
+msgstr "Détails"
+
+#: ../src/interface.h:81
+msgid "Details Tree"
+msgstr "Détails à arborescence"
+
+#: ../src/io.c:389
+msgid "Performing quick check, please wait:"
+msgstr "Vérification rapide en cours, veuillez patienter:"
+
+#: ../src/keyboard.c:79
+msgid "French Layout"
+msgstr "Disposition française"
+
+#: ../src/keyboard.c:80
+msgid "German Layout"
+msgstr "Disposition allemande"
+
+#: ../src/mame-exec.c:1200
+#, c-format
+msgid "Getting list of valid MAME options using parameter %s"
+msgstr ""
+"Obtention de la liste des options MAME valides utilisant le paramètre %s"
+
+#. Note: Newer versions of MAME do not report the type
+#: ../src/mame-exec.c:1219
+#, c-format
+msgid "Found option: %s %s%s (%s)"
+msgstr "Option: %s %s%s (%s) trouvée"
+
+#: ../src/mame-exec.c:1224
+#, c-format
+msgid "Description: \"%s\""
+msgstr "Description: \"%s\""
+
+#: ../src/mame-exec.c:1228
+msgid "Possible values: "
+msgstr "Valeurs possibles: "
+
+#: ../src/mameio.c:483 ../src/mameio.c:640
+msgid "Creating game list..."
+msgstr "Création de la liste de jeux"
+
+#: ../src/mameio.c:484
+msgid "Creating game list, please wait"
+msgstr "Création de la liste de jeux, veuillez patienter"
+
+#: ../src/mameio.c:518 ../src/mameio.c:668
+#, c-format
+msgid "Creating game list (%d games)..."
+msgstr "Création de la liste de jeux (%d jeux)..."
+
+#: ../src/mameio.c:643
+msgid "receiving data, please wait"
+msgstr "réception des données, veuillez patienter"
+
+#: ../src/mameio.c:666
+msgid "creating game list, Please wait:"
+msgstr "création de la liste de jeux, veuillez patienter:"
+
+#: ../src/mameio.c:935
+msgid "xmame not found"
+msgstr "impossible de trouver xmame"
+
+#: ../src/mameio.c:954
+msgid "I don't know how to generate a gamelist for this version of MAME!"
+msgstr ""
+"Je ne sais pas comment générer une liste de jeux pour cette version de MAME"
+
+#. Check that the selected version of MAME supports this option
+#: ../src/mame_options.c:237
+#, c-format
+msgid "Checking that MAME supports the option %s..."
+msgstr "Vérification du support par MAME de l'option %s..."
+
+#: ../src/mame_options.c:239
+msgid "...it does"
+msgstr "...supportée"
+
+#: ../src/mame_options.c:243
+#, c-format
+msgid "Error retrieving options value for key %s in category %s: %s"
+msgstr "Erreur à la récupération de la valeur des options pour la clé %s: %s"
+
+#: ../src/mame_options.c:284
+msgid "...it doesn't"
+msgstr "...non supportée"
+
+#: ../src/mame_options.c:1247 ../src/mame_options_legacy_dialog.c:589
+#, c-format
+msgid "The option %s is not supported by MAME %s"
+msgstr "L'option %s n'est pas supportée par MAME %s"
+
+#: ../src/mame_options_dialog.c:225
+msgid "MAME Options"
+msgstr "Options de MAME"
+
+#: ../src/mame_options_legacy.c:711
+#, c-format
+msgid "Retrieving default int value for %s: %d"
+msgstr "Récupération de la valeur int par défaut pour %s: %s"
+
+#: ../src/mame_options_legacy.c:749
+#, c-format
+msgid "Retrieving default double value for %s: %.2f"
+msgstr "Récupération de la valeur double par défaut pour %s: %.2f"
+
+#: ../src/mame_options_legacy.c:787
+#, c-format
+msgid "Retrieving default boolean value for %s: %d"
+msgstr "Récupération de la valeur boléenne par défaut pour %s: %d"
+
+#: ../src/mame_options_legacy_dialog.c:837
+msgid "MAME Legacy Options"
+msgstr "Options Legacy de MAME"
+
+#: ../src/progression_window.c:75
+msgid "Progress Window"
+msgstr "Fenêtre de progression"
+
+#: ../src/progression_window.c:88
+msgid "Loading Game..."
+msgstr "Chargement du jeu..."
+
+#: ../src/progression_window.c:100
+msgid "rom"
+msgstr "rom"
+
+#: ../src/rom_entry.c:1039
+msgid " (sound)"
+msgstr " (son)"
+
+#: ../src/rom_entry.h:88
+msgid "Problems"
+msgstr "Problèmes"
+
+#: ../src/rom_entry.h:90
+msgid "Not Available"
+msgstr "Non disponible"
+
+#: ../src/rom_entry.h:91
+msgid "Not a valid set"
+msgstr "Set invalide"
+
+#: ../src/gmameui-zip-utils.c:45
+msgid "Loaded pixbuf"
+msgstr "Pixbuf chargé"
+
+#: ../data/audit_window.glade.h:1
+msgid "0"
+msgstr "0"
+
+#: ../data/audit_window.glade.h:2
+msgid "<b>Details</b>"
+msgstr "<b>Détails</b>"
+
+#: ../data/audit_window.glade.h:3
+msgid "<b>ROMs</b>"
+msgstr "<b>ROMs</b>"
+
+#: ../data/audit_window.glade.h:4
+msgid "<b>Samples</b>"
+msgstr "<b>Samples</b>"
+
+#: ../data/audit_window.glade.h:7
+msgid "Best available:"
+msgstr "Meilleur disponible"
+
+#: ../data/audit_window.glade.h:8
+msgid "Checking Games"
+msgstr "Vérification des jeux"
+
+#: ../data/audit_window.glade.h:9
+msgid "Correct:"
+msgstr "Correct:"
+
+#: ../data/audit_window.glade.h:11
+msgid ""
+"GMAMEUI is now auditing the ROMs in the specified ROM paths. This may take "
+"some time."
+msgstr ""
+"GMAMEUI effectue l'audit des ROM dans les chemins d'accès spécifiés. Cela "
+"peut prendre du temps."
+
+#: ../data/audit_window.glade.h:12
+msgid "Incorrect:"
+msgstr "Incorrect:"
+
+#: ../data/audit_window.glade.h:13
+msgid "Not found:"
+msgstr "Non trouvé:"
+
+#: ../data/audit_window.glade.h:14
+msgid "Total:"
+msgstr "Total:"
+
+#: ../data/audit_window.glade.h:15 ../data/gmameui_prefs.glade.h:22
+#: ../data/rom_info.glade.h:15
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../data/audit_window.glade.h:16
+msgid "gtk-stop"
+msgstr "gtk-stop"
+
+#: ../data/directories.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../data/directories.glade.h:2
+msgid "<b>MAME Executables</b>"
+msgstr "<b>Exécutables MAME</b>"
+
+#: ../data/directories.glade.h:3
+msgid "<b>MAME Paths</b>"
+msgstr "<b>Chemins d'accès de MAME</b>"
+
+#: ../data/directories.glade.h:4
+msgid "<b>MAME Support Files</b>"
+msgstr "<b>Fichiers de support de MAME</b>"
+
+#: ../data/directories.glade.h:5
+msgid "Artwork:"
+msgstr "Artwork:"
+
+#: ../data/directories.glade.h:6
+msgid "Browse..."
+msgstr "Naviguer..."
+
+#: ../data/directories.glade.h:7
+msgid "Cabinets:"
+msgstr "Cabinets:"
+
+#: ../data/directories.glade.h:8
+msgid "Catver file:"
+msgstr "Fichier Catver:"
+
+#: ../data/directories.glade.h:9
+msgid "Cheat file:"
+msgstr "Fichier de cheat:"
+
+#: ../data/directories.glade.h:10
+msgid "Control panels:"
+msgstr "Panneaux de contrôle:"
+
+#: ../data/directories.glade.h:11
+msgid "Controller directory:"
+msgstr "Répertoire du contrôleur:"
+
+#: ../data/directories.glade.h:13
+msgid "Flyers:"
+msgstr "Flyers:"
+
+#: ../data/directories.glade.h:14
+msgid "High score file:"
+msgstr "Fichier de meilleurs scores:"
+
+#: ../data/directories.glade.h:15
+msgid "History file:"
+msgstr "Fichier d'historique:"
+
+#: ../data/directories.glade.h:16
+msgid "Icons directory:"
+msgstr "Répertoire d'icônes:"
+
+#: ../data/directories.glade.h:17
+msgid "MAME Main Paths"
+msgstr "Chemins principaux de MAME"
+
+#: ../data/directories.glade.h:18
+msgid "MAME Paths"
+msgstr "Chemins de MAME"
+
+#: ../data/directories.glade.h:19
+msgid "MAME Support Files"
+msgstr "Fichiers de support de MAME"
+
+#: ../data/directories.glade.h:20
+msgid "MAME executables"
+msgstr "Exécutables MAME"
+
+#: ../data/directories.glade.h:21
+msgid "MAME info file:"
+msgstr "Fichier info de MAME:"
+
+#: ../data/directories.glade.h:22
+msgid "Marquees:"
+msgstr "Marquees:"
+
+#: ../data/directories.glade.h:25
+msgid "Snapshots:"
+msgstr "Captures d'écran:"
+
+#: ../data/directories.glade.h:26
+msgid "Title screenshots:"
+msgstr "Captures d'écran titre"
+
+#: ../data/directories.glade.h:27
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../data/directories.glade.h:28
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
+
+#: ../data/directories.glade.h:29
+msgid "gtk-ok"
+msgstr "gtk-ok"
+
+#: ../data/directories.glade.h:30
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../data/gmameui_prefs.glade.h:1
+msgid "'The' as a prefix"
+msgstr "'The' comme préfixe"
+
+#: ../data/gmameui_prefs.glade.h:2
+msgid "<b>Startup Options</b>"
+msgstr "<b>Options de démarrage</b>"
+
+#: ../data/gmameui_prefs.glade.h:3
+msgid "<b>User Interface Options</b>"
+msgstr "<b>Options de l'interface utilisateur</b>"
+
+#: ../data/gmameui_prefs.glade.h:4
+msgid "Allow game selection with a joystick"
+msgstr "Permettre la sélection des jeux avec le joystick"
+
+#: ../data/gmameui_prefs.glade.h:9
+msgid "Enable version mismatch warning"
+msgstr "Activer les avertissements de version non compatible"
+
+#: ../data/gmameui_prefs.glade.h:11
+msgid "Game Name"
+msgstr "Nom du jeu"
+
+#: ../data/gmameui_prefs.glade.h:12
+msgid "Joystick device:"
+msgstr "Périphérique joystick:"
+
+#: ../data/gmameui_prefs.glade.h:14
+msgid "Playcount"
+msgstr "Nombre de fois joué"
+
+#: ../data/gmameui_prefs.glade.h:15
+msgid "Prefer custom icons over status icons"
+msgstr "Préférer des icônes personnalisées aux icônes d'état"
+
+#: ../data/gmameui_prefs.glade.h:17
+msgid "Search for new games"
+msgstr "Chercher de nouveaux jeux"
+
+#: ../data/gmameui_prefs.glade.h:18
+msgid "Use MAME default options"
+msgstr "Utilise les options par défaut de MAME"
+
+#: ../data/gmameui_prefs.glade.h:20
+msgid "Visible columns"
+msgstr "Colonnes visibles"
+
+#: ../data/main_gui.glade.h:2
+msgid "Available ROMs"
+msgstr "ROM disponibles"
+
+#: ../data/main_gui.glade.h:3
+msgid "Unavailable ROMs"
+msgstr "ROM non disponibles"
+
+#: ../data/options.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../data/options.glade.h:2
+msgid ""
+"48000\n"
+"44100\n"
+"22050\n"
+"11025"
+msgstr ""
+"48000\n"
+"44100\n"
+"22050\n"
+"11025"
+
+#: ../data/options.glade.h:6 ../data/properties.glade.h:15
+msgid "<b>Artwork</b>"
+msgstr "<b>Artwork</b>"
+
+#: ../data/options.glade.h:7
+msgid "<b>Debugging</b>"
+msgstr "<b>Déboguage</b>"
+
+#: ../data/options.glade.h:8
+msgid "<b>Input</b>"
+msgstr "<b>Entrée</b>"
+
+#: ../data/options.glade.h:9 ../data/options_legacy.glade.h:29
+msgid "<b>Miscellaneous Options</b>"
+msgstr "<b>Options diverses</b>"
+
+#: ../data/options.glade.h:10 ../data/options_legacy.glade.h:30
+msgid "<b>OpenGL</b>"
+msgstr "<b>OpenGL</b>"
+
+#: ../data/options.glade.h:11
+msgid "<b>Performance</b>"
+msgstr "<b>Performance</b>"
+
+#: ../data/options.glade.h:12 ../data/options_legacy.glade.h:32
+#: ../data/properties.glade.h:38
+msgid "<b>Rotation</b>"
+msgstr "<b>Rotation</b> "
+
+#: ../data/options.glade.h:13
+msgid "<b>Screen</b>"
+msgstr "<b>Écran</b>"
+
+#: ../data/options.glade.h:14
+msgid "<b>Sound</b>"
+msgstr "<b>Son</b>"
+
+#: ../data/options.glade.h:15
+msgid "<b>State and Playback Options</b>"
+msgstr "<b>Options d'état et de relecture (playback)</b>"
+
+#: ../data/options.glade.h:16
+msgid "<b>Vector</b>"
+msgstr "<b>Vecteur</b>"
+
+#: ../data/options.glade.h:17
+msgid "<b>Video</b>"
+msgstr "<b>Vidéo</b>"
+
+#: ../data/options.glade.h:18
+msgid ""
+"Adjust gameplay speed to keep refresh rate lower than the screen (-"
+"refreshspeed)"
+msgstr ""
+"Ajuste la vitesse du jeu pour garder un taux de rafraîchissement moins "
+"rapide que celui de l'écran (-refreshspeed)"
+
+#: ../data/options.glade.h:19
+msgid "Allow non-integer stretch factors (-unevenstretch)"
+msgstr "Permet des facteurs d'étirement non entiers (-unevenstretch)"
+
+#: ../data/options.glade.h:20
+msgid "Allow uneven stretching"
+msgstr "Permet un étirement non proportionnel"
+
+#: ../data/options.glade.h:21
+msgid "Antialias"
+msgstr "Antialiasing"
+
+#: ../data/options.glade.h:22 ../data/options_legacy.glade.h:37
+msgid "Artwork"
+msgstr "Artwork"
+
+#: ../data/options.glade.h:23
+msgid "Audio latency"
+msgstr "Latence de l'audio"
+
+#: ../data/options.glade.h:24
+msgid "Automatic Rotation"
+msgstr "Rotation automatique"
+
+#: ../data/options.glade.h:25
+msgid "Automatic frameskip"
+msgstr "Saut de trame automatique"
+
+#: ../data/options.glade.h:26
+msgid "Automatically save and load state"
+msgstr "Sauvegarde et chargement d'état automatique"
+
+#: ../data/options.glade.h:27
+msgid "Automatically save and load the current state (-autosave)"
+msgstr "Sauvegarde et chargement de l'état courant automatique (-autosave)"
+
+#: ../data/options.glade.h:28
+msgid "Automatically skip frames (-autoframeskip)"
+msgstr "Saut de trames automatique (-autoframeskip)"
+
+#: ../data/options.glade.h:29
+msgid "BIOS name"
+msgstr "Nom du BIOS"
+
+#: ../data/options.glade.h:30
+msgid "Beam width:"
+msgstr "Largeur des lignes:"
+
+#: ../data/options.glade.h:31
+msgid "Brightness"
+msgstr "Luminosité"
+
+#: ../data/options.glade.h:32
+msgid "Brightness correction (-brightness)"
+msgstr "Correction de luminosité (-brightness)"
+
+#: ../data/options.glade.h:33
+msgid "Brightness when paused (-pause_brightness)"
+msgstr "Luminosité en pause (-pause_brightness)"
+
+#: ../data/options.glade.h:34
+msgid "Centre horizontally (-centerh)"
+msgstr "Centrer horizontalement (-centerh)"
+
+#: ../data/options.glade.h:35
+msgid "Centre vertically (-centerv)"
+msgstr "Centrer verticalement (-centerv)"
+
+#: ../data/options.glade.h:36
+msgid "Centre:"
+msgstr "Centrer:"
+
+#: ../data/options.glade.h:37
+msgid "Constrain to the proper aspect ratio (-keepaspect)"
+msgstr "Forcer des proportions correctes (-keepaspect)"
+
+#: ../data/options.glade.h:38
+msgid "Contrast"
+msgstr "Contraste"
+
+#: ../data/options.glade.h:39
+msgid "Contrast correction (-contrast)"
+msgstr "Correction de contraste (-contrast)"
+
+#: ../data/options.glade.h:40
+msgid "Control speed of gameplay; lower values are slower (-speed)"
+msgstr ""
+"Contrôler la vitesse du jeu; les valeurs inférieures sont plus lentes (-"
+"speed)"
+
+#: ../data/options.glade.h:41
+msgid "Controller directory"
+msgstr "Répertoire de contrôleur"
+
+#: ../data/options.glade.h:42
+msgid "Convert lightgun button 2 to offscreen support"
+msgstr "Affecte le bouton 2 du pistolet au support hors écran"
+
+#: ../data/options.glade.h:43 ../data/options_legacy.glade.h:57
+#: ../data/properties.glade.h:69
+msgid "Crop artwork"
+msgstr "Retaile l'artwork"
+
+#: ../data/options.glade.h:44
+msgid "Crop artwork to game screen size (-artwork_crop)"
+msgstr "Retaille l'artwork à la taille de l'écran de jeu (-artwork_crop)"
+
+#: ../data/options.glade.h:45
+msgid "Debug script:"
+msgstr "Script de déboguage:"
+
+#: ../data/options.glade.h:46
+msgid "Disable OpenGL GL_ARB_texture_rectangle"
+msgstr "Désactiver OpenGL GL_ARB_texture_rectangle"
+
+#: ../data/options.glade.h:47
+msgid "Disable OpenGL GL_ARB_texture_rectangle (-gl_notexturerect)"
+msgstr "Désactiver OpenGL GL_ARB_texture_rectangle (-gl_notexturerect)"
+
+#: ../data/options.glade.h:48
+msgid "Display additional diagnostic information (-verbose)"
+msgstr "Afficher des informations de diagnostic additionelles (-verbose)"
+
+#: ../data/options.glade.h:49
+msgid "Effect name:"
+msgstr "Nom de l'effet:"
+
+#: ../data/options.glade.h:50
+msgid "Enable OpenGL GLSL"
+msgstr "Aciver OpenGL GLSL"
+
+#: ../data/options.glade.h:51
+msgid "Enable OpenGL GLSL filtering if available (-gl_glsl)"
+msgstr "Activer le filtrage OpenGL GLSL si disponible (-gl_glsl)"
+
+#: ../data/options.glade.h:52
+msgid ""
+"Enable OpenGL GLSL handling of brightness and contrast (-gl_glsl_vid_attr)"
+msgstr ""
+"Activer la gestion de la luminosité et du contraste par OpenGL GLSL (-"
+"gl_glsl_vid_attr)"
+
+#: ../data/options.glade.h:53
+msgid "Enable OpenGL PBO if available (-gl_pbo)"
+msgstr "Activer OpenGL PBO si disponible (-gl_pbo)"
+
+#: ../data/options.glade.h:54
+msgid "Enable OpenGL VBO"
+msgstr "Activer OpenGL VBO"
+
+#: ../data/options.glade.h:55
+msgid "Enable OpenGL VBO if available (-gl_vbo)"
+msgstr "Activer OpenGL VBO si disponible (-gl_vbo)"
+
+#: ../data/options.glade.h:56
+msgid "Enable bilinear filtering (-filter)"
+msgstr "Activer le filtrage bilinéaire (-filter)"
+
+#: ../data/options.glade.h:57
+msgid "Enable cheat mode"
+msgstr "Activer le mode cheat"
+
+#: ../data/options.glade.h:58
+msgid "Enable cheats in games (-cheat)"
+msgstr "Activer les cheats dans les jeux (-cheat)"
+
+#: ../data/options.glade.h:59
+msgid "Enable debugger"
+msgstr "Activer le déboguage"
+
+#: ../data/options.glade.h:60
+msgid "Enable input from multiple connected devices"
+msgstr "Activer les entrées de multiples périphériques connectés"
+
+#: ../data/options.glade.h:61
+msgid "Enable joystick"
+msgstr "Activer le joystick"
+
+#: ../data/options.glade.h:62
+msgid "Enable lightgun"
+msgstr "Activer le pistolet"
+
+#: ../data/options.glade.h:63
+msgid "Enable logging"
+msgstr "Activer le logging"
+
+#: ../data/options.glade.h:64
+msgid "Enable mouse"
+msgstr "Activer la souris"
+
+#: ../data/options.glade.h:65
+msgid "Enable multithreading"
+msgstr "Activer le multithreading"
+
+#: ../data/options.glade.h:66
+msgid "Enable samples"
+msgstr "Activer les samples"
+
+#: ../data/options.glade.h:67
+msgid "Enable samples if available (-samples)"
+msgstr "Activer les samples si disponibles (-samples)"
+
+#: ../data/options.glade.h:68 ../data/options_legacy.glade.h:84
+#: ../data/properties.glade.h:86
+msgid "Enable sound"
+msgstr "Activer le son"
+
+#: ../data/options.glade.h:69
+msgid "Enable sound output (-sound)"
+msgstr "Activer la sortie son (-sound)"
+
+#: ../data/options.glade.h:70 ../data/options_legacy.glade.h:85
+msgid "Enable steadykey support"
+msgstr "Activer le support steadykey"
+
+#: ../data/options.glade.h:71
+msgid "Enable/disable debugger (-debug)"
+msgstr "Activer/désactiver le debogueur (-debug)"
+
+#: ../data/options.glade.h:72
+msgid "Filter"
+msgstr "Filtre"
+
+#: ../data/options.glade.h:73
+msgid "Flicker:"
+msgstr "Scintillement:"
+
+#: ../data/options.glade.h:74
+msgid "Flip"
+msgstr "Retournement"
+
+#: ../data/options.glade.h:75
+msgid "Flip screen left-right (-flipx)"
+msgstr "Retourner l'écran horizontalement (-flipx)"
+
+#: ../data/options.glade.h:76
+msgid "Flip screen upside-down (-flipy)"
+msgstr "Retourner l'écran verticalement (-flipy)"
+
+#: ../data/options.glade.h:77
+msgid "Force power of two textures"
+msgstr "Forcer les puissances de deux textures"
+
+#: ../data/options.glade.h:78
+msgid "Force power of two textures (gl_forcepow2texture)"
+msgstr "Forcer les puissances de deux textures (gl_forcepow2texture)"
+
+#: ../data/options.glade.h:79 ../data/options_legacy.glade.h:103
+#: ../data/properties.glade.h:93
+msgid "Frames to skip:"
+msgstr "Trames à sauter:"
+
+#: ../data/options.glade.h:80
+msgid "Gamma"
+msgstr "Gamma"
+
+#: ../data/options.glade.h:81
+msgid "Gamma correction (-gamma)"
+msgstr "Correction du gamma (-gamma)"
+
+#: ../data/options.glade.h:82
+msgid "Generate an error.log file (-log)"
+msgstr "Générer un fichier error.log (-log)"
+
+#: ../data/options.glade.h:83
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: ../data/options.glade.h:84
+msgid "If this is selected, MAME will run in a window (-window)"
+msgstr ""
+"Sélectionner cette option pour exécuter MAME dans une fenêtre (-window)"
+
+#: ../data/options.glade.h:85 ../data/properties.glade.h:109
+msgid "Keep aspect ratio"
+msgstr "Garder les proportions"
+
+#: ../data/options.glade.h:86
+msgid "Keep calling video updates whilst paused (-update_in_pause)"
+msgstr ""
+"Continuer de demander les mises à jour vidéo quand en pause (-"
+"update_in_pause)"
+
+#: ../data/options.glade.h:87
+msgid "Keyboard"
+msgstr "Clavier"
+
+#: ../data/options.glade.h:88
+msgid "Left-right"
+msgstr "Gauche-droite"
+
+#: ../data/options.glade.h:89
+msgid "Let OpenGL manage brightness and contrast"
+msgstr "Laisser OpenGL gérer la luminosité et le contraste"
+
+#: ../data/options.glade.h:90
+msgid "Maximize"
+msgstr "Maximiser"
+
+#: ../data/options.glade.h:91
+msgid "Mouse"
+msgstr "Souris"
+
+#: ../data/options.glade.h:92
+msgid ""
+"Name of a .png file in the Artwork directory to use for scanlines effect (-"
+"effect)"
+msgstr ""
+"Nom d'un fichier .png du répertoire Artwork à utiliser pour l'effect "
+"scanlines (-effect)"
+
+#: ../data/options.glade.h:93
+msgid ""
+"No filter\n"
+"Bilinear\n"
+"Gaussian blur"
+msgstr ""
+"Aucun filtre\n"
+"Bilinéaire\n"
+"Flou gaussien"
+
+#: ../data/options.glade.h:96
+msgid "Number of screens to create - MAME only supports 1 (-numscreens)"
+msgstr "Nombre d'écrans à créer - MAME n'en supporte qu'un (-numscreens)"
+
+#: ../data/options.glade.h:97
+msgid "Number of screens:"
+msgstr "Nombre d'écrans:"
+
+#: ../data/options.glade.h:98
+msgid "Other options"
+msgstr "Autres options"
+
+#: ../data/options.glade.h:99
+msgid "Output error.log data to debugger"
+msgstr "Transférer les données error.log au débogueur"
+
+#: ../data/options.glade.h:100
+msgid "Output error.log data to the system debugger (-oslog)"
+msgstr "Transférer les données error.log au débogueur système (-oslog)"
+
+#: ../data/options.glade.h:101
+msgid "Pause Brightness"
+msgstr "Luminosité en pause"
+
+#: ../data/options.glade.h:102
+msgid "Perform rendering and blitting on a separate thread (-multithreading)"
+msgstr ""
+"Effectuer le rendu et le blitting dans un processus séparé (-multithreading)"
+
+#: ../data/options.glade.h:103
+msgid "Prescale"
+msgstr "Prescale"
+
+#: ../data/options.glade.h:104
+msgid "Record AVI"
+msgstr "Enregistrement en AVI"
+
+#: ../data/options.glade.h:105
+msgid "Record MNG"
+msgstr "Enregistrement en MNG"
+
+#: ../data/options.glade.h:106
+msgid "Record WAV"
+msgstr "Enregistrement en WAV"
+
+#: ../data/options.glade.h:107
+msgid "Records a .avi movie to the Snapshot directory (-recordavi)"
+msgstr "Enregistrer une vidéo .avi dans le répertoire Snapshot (-recordavi)"
+
+#: ../data/options.glade.h:108
+msgid "Records a .mng movie to the Snapshot directory (-recordmng)"
+msgstr "Enregistrer une vidéo .mng dans le répertoire Snapshot (-recordmng)"
+
+#: ../data/options.glade.h:109
+msgid "Records a .wav sound file to the Snapshot directory (-recordwav)"
+msgstr ""
+"Enregistrer un fichier son .wav dans le répertoire Snapshot (-recordwav)"
+
+#: ../data/options.glade.h:110
+msgid "Reduce tearing effects"
+msgstr "Réduit les effets de tearing"
+
+#: ../data/options.glade.h:111
+msgid "Refresh speed"
+msgstr "Vitesse de rafraîchissement"
+
+#: ../data/options.glade.h:112 ../data/options_legacy.glade.h:135
+msgid "Rotate left"
+msgstr "Rotation vers la gauche"
+
+#: ../data/options.glade.h:113 ../data/options_legacy.glade.h:136
+msgid "Rotate right"
+msgstr "Rotation vers la droite"
+
+#: ../data/options.glade.h:114
+msgid "Rotate screen anticlockwise 90 degrees (-rol)"
+msgstr "Rotation anti-horaire de l'écran de 90 degrés (-rol)"
+
+#: ../data/options.glade.h:115
+msgid "Rotate screen clockwise 90 degrees (-ror)"
+msgstr "Rotation horaire de l'écran de 90 degrés (-ror)"
+
+#: ../data/options.glade.h:116
+msgid "Rotation"
+msgstr "Rotation"
+
+#: ../data/options.glade.h:117
+msgid "Run in window"
+msgstr "Exécuter dans une fenêtre"
+
+#: ../data/options.glade.h:118
+msgid "Sample rate"
+msgstr "Taux d'échantillonnage"
+
+#: ../data/options.glade.h:119
+msgid "Scale game graphics before rendering (-prescale)"
+msgstr "Mise à l'échelle des graphismes avant le rendu (-prescale)"
+
+#: ../data/options.glade.h:120
+msgid "Scale mode (-scalemode)"
+msgstr "Mode de mise à l'échelle (-scalemode)"
+
+#: ../data/options.glade.h:121
+msgid "Screen"
+msgstr "Écran"
+
+#: ../data/options.glade.h:122
+msgid "Script for debugger (-debugscript)"
+msgstr "Script pour le déboguage (-debugscript)"
+
+#: ../data/options.glade.h:123
+msgid ""
+"Set audio latency (increase to reduce glitches, decrease for responsiveness "
+"(-audio_latency)"
+msgstr ""
+"Choisir la latence audio (augmenter pour réduire les glitches, diminuer pour "
+"une meilleure réactivité (-audio_latency)"
+
+#: ../data/options.glade.h:124
+msgid "Set vector beam width (-beam)"
+msgstr "Choisir la largeur des lignes vectorielles (-beam)"
+
+#: ../data/options.glade.h:125
+msgid "Set vector flicker effect (-flicker)"
+msgstr "Choisir l'effet de scintillement vectoriel (-flicker)"
+
+#: ../data/options.glade.h:126
+msgid "Show FPS"
+msgstr "Afficher les FPS"
+
+#: ../data/options.glade.h:127
+msgid "Show the Frames per Second count (-sdlvideofps)"
+msgstr "Afficher le nombre de trames à la seconde (-sdlvideofps)"
+
+#: ../data/options.glade.h:128
+msgid "Skip gameinfo"
+msgstr "Passer gameinfo"
+
+#: ../data/options.glade.h:129
+msgid "Skip the ROM information screen on launch (-skip_gameinfo)"
+msgstr "Passer l'écran d'information de la ROM au lancement (-skip_gameinfo)"
+
+#: ../data/options.glade.h:130
+msgid "Sleep"
+msgstr "Mettre en veille"
+
+#: ../data/options.glade.h:131
+msgid "Sleeping when idle (-sleep)"
+msgstr "Mettre en veille si inactif (-sleep)"
+
+#: ../data/options.glade.h:132
+msgid ""
+"Software\n"
+"OpenGL"
+msgstr ""
+"Logiciel\n"
+"OpenGL"
+
+#: ../data/options.glade.h:134
+msgid "Sound volume in decibels (-volume)"
+msgstr "Volume sonore en décibels (-volume)"
+
+#: ../data/options.glade.h:135
+msgid "Speed:"
+msgstr "Vitesse:"
+
+#: ../data/options.glade.h:136
+msgid "Start in maximized window (-maximize)"
+msgstr "Lancer dans une fenêtre maximisée (-maximize)"
+
+#: ../data/options.glade.h:137 ../data/options_legacy.glade.h:149
+#: ../data/properties.glade.h:139
+msgid "Throttle"
+msgstr "Accélération"
+
+#: ../data/options.glade.h:138
+msgid "Throttle game in sync with real time (-throttle)"
+msgstr ""
+"Adapter la vitesse du jeu en synchronisant avec le temps réel (-throttle)"
+
+#: ../data/options.glade.h:139
+msgid "Up-down"
+msgstr "Haut-bas"
+
+#: ../data/options.glade.h:140
+msgid "Update in pause"
+msgstr "Mettre à jour quand en pause"
+
+#: ../data/options.glade.h:141
+msgid "Use antialias when drawing vectors (-antialias)"
+msgstr "Utiliser l'antialiasing pour le tracé de vecteurs (-antialias)"
+
+#: ../data/options.glade.h:142
+msgid "Use backdrops"
+msgstr "Utiliser les arrière-plans"
+
+#: ../data/options.glade.h:143
+msgid "Use backdrops if artwork is enabled and available (-use_backdrops)"
+msgstr ""
+"Utiliser les arrière-plans si l'artworks est activé et disponible (-"
+"use_backdrops)"
+
+#: ../data/options.glade.h:144
+msgid "Use bezels"
+msgstr "Utiliser les bezels"
+
+#: ../data/options.glade.h:145
+msgid "Use bezels if artwork is enabled and available (-use_bezels)"
+msgstr ""
+"Utiliser les bezels si l'artwork est activé et disponible (-use_bezels)"
+
+#: ../data/options.glade.h:146
+msgid "Use overlays"
+msgstr "Utiliser les overlays"
+
+#: ../data/options.glade.h:147
+msgid "Use overlays if artwork is enabled and available (-use_overlays)"
+msgstr ""
+"Utiliser les overlays  si l'artwork est activé et disponible (-use_overlays)"
+
+#: ../data/options.glade.h:149
+msgid "Verbose logging"
+msgstr "Verbose logging"
+
+#: ../data/options.glade.h:150
+msgid "Vertical"
+msgstr "Vertical"
+
+#: ../data/options.glade.h:151
+msgid "Video"
+msgstr "Vidéo"
+
+#: ../data/options.glade.h:152 ../data/properties.glade.h:155
+msgid "Video mode:"
+msgstr "Mode vidéo:"
+
+#: ../data/options.glade.h:153 ../data/options_legacy.glade.h:159
+msgid "Volume"
+msgstr "Volume"
+
+#: ../data/options.glade.h:154
+msgid "Wait for VBLANK before flipping screens factors (-waitvsync)"
+msgstr ""
+"Attendre la VBLANK avant de retourner les facteurs d'écran (-waitvsync)"
+
+#: ../data/options.glade.h:155
+msgid ""
+"Whether software (soft) or hardware (OpenGL) acceleration is used (-video)"
+msgstr ""
+"Détermine si l'accélération logicielle (soft) ou matérielle (OpenGL) est "
+"utilisée (-video)"
+
+#: ../data/options.glade.h:156
+msgid "YUV mode:"
+msgstr "Mode YUV:"
+
+#: ../data/options.glade.h:157 ../data/options_legacy.glade.h:161
+#: ../data/properties.glade.h:163
+msgid "dB"
+msgstr "dB"
+
+#: ../data/options.glade.h:158
+msgid "gl_glsl_filter"
+msgstr "gl_glsl_filter"
+
+#: ../data/options.glade.h:159
+msgid ""
+"none\n"
+"aperture1x2rb\n"
+"aperture1x3rb\n"
+"aperture2x4bg\n"
+"aperture2x4rb\n"
+"aperture4x6\n"
+"scanlines"
+msgstr ""
+"aucun\n"
+"aperture1x2rb\n"
+"aperture1x3rb\n"
+"aperture2x4bg\n"
+"aperture2x4rb\n"
+"aperture4x6\n"
+"scanlines"
+
+#: ../data/options.glade.h:166
+msgid ""
+"none\n"
+"async\n"
+"yv12\n"
+"yuy2\n"
+"yv12x2\n"
+"yuy2x2"
+msgstr ""
+"aucun\n"
+"async\n"
+"yv12\n"
+"yuy2\n"
+"yv12x2\n"
+"yuy2x2"
+
+#: ../data/options_legacy.glade.h:1 ../data/properties.glade.h:1
+msgid ""
+"/dev/dsp\n"
+"/dev/dsp0\n"
+"/dev/dsp1\n"
+"/dev/dsp2\n"
+"/dev/dsp3\n"
+"/dev/audio\n"
+"/dev/null"
+msgstr ""
+"/dev/dsp\n"
+"/dev/dsp0\n"
+"/dev/dsp1\n"
+"/dev/dsp2\n"
+"/dev/dsp3\n"
+"/dev/audio\n"
+"/dev/null"
+
+#: ../data/options_legacy.glade.h:8 ../data/properties.glade.h:8
+msgid "/dev/mixer"
+msgstr "/dev/mixer"
+
+#: ../data/options_legacy.glade.h:9
+msgid ""
+"320x200\n"
+"640x480\n"
+"800x600\n"
+"1024x768\n"
+"1280x1024\n"
+"1600x1200"
+msgstr ""
+"320x200\n"
+"640x480\n"
+"800x600\n"
+"1024x768\n"
+"1280x1024\n"
+"1600x1200"
+
+#: ../data/options_legacy.glade.h:15
+msgid ""
+"8000\n"
+"11025\n"
+"16000\n"
+"22050\n"
+"44100\n"
+"48000"
+msgstr ""
+"8000\n"
+"11025\n"
+"16000\n"
+"22050\n"
+"44100\n"
+"48000"
+
+#: ../data/options_legacy.glade.h:21
+msgid "<b>Artwork options</b>"
+msgstr "<b>Options d'artwork</b>"
+
+#: ../data/options_legacy.glade.h:22 ../data/properties.glade.h:21
+msgid "<b>Corrections</b>"
+msgstr "<b>Corrections</b>"
+
+#: ../data/options_legacy.glade.h:23
+msgid "<b>Digital sound and mixer options</b>"
+msgstr "<b>Options de son et mixeur digitaux</b>"
+
+#: ../data/options_legacy.glade.h:24 ../data/properties.glade.h:22
+msgid "<b>Display options</b>"
+msgstr "<b>Options d'affichage</b>"
+
+#: ../data/options_legacy.glade.h:25 ../data/properties.glade.h:23
+msgid "<b>Effects</b>"
+msgstr "<b>Effets</b>"
+
+#: ../data/options_legacy.glade.h:26 ../data/properties.glade.h:25
+msgid "<b>Frame skipping</b>"
+msgstr "<b>Saut de trames</b>"
+
+#: ../data/options_legacy.glade.h:27 ../data/properties.glade.h:26
+msgid "<b>General sound options</b>"
+msgstr "<b>Options générales de son</b>"
+
+#: ../data/options_legacy.glade.h:28 ../data/properties.glade.h:27
+msgid "<b>Joystick</b>"
+msgstr "<b>Joystick</b>"
+
+#: ../data/options_legacy.glade.h:31 ../data/properties.glade.h:36
+msgid "<b>Resolution</b>"
+msgstr "<b>Résolution</b>"
+
+#: ../data/options_legacy.glade.h:33 ../data/properties.glade.h:43
+msgid "<b>Vector options</b>"
+msgstr "<b>Options vectorielles</b>"
+
+#: ../data/options_legacy.glade.h:34
+msgid "<b>X11-input</b>"
+msgstr "<b>X11-input</b>"
+
+#: ../data/options_legacy.glade.h:35
+msgid "Always use mouse"
+msgstr "Toujours utiliser la souris"
+
+#: ../data/options_legacy.glade.h:36 ../data/properties.glade.h:52
+msgid "Analog joystick"
+msgstr "Joystick analogique"
+
+#: ../data/options_legacy.glade.h:38 ../data/properties.glade.h:54
+msgid "Artwork resolution:"
+msgstr "Résolution des artworks:"
+
+#: ../data/options_legacy.glade.h:39 ../data/properties.glade.h:55
+msgid "Audio device:"
+msgstr "Périphérique audio:"
+
+#: ../data/options_legacy.glade.h:40
+msgid ""
+"Auto\n"
+"8 bits\n"
+"15 bits\n"
+"16 bits\n"
+"32 bits"
+msgstr ""
+"Auto\n"
+"8 bits\n"
+"15 bits\n"
+"16 bits\n"
+"32 bits"
+
+#: ../data/options_legacy.glade.h:45
+msgid ""
+"Auto\n"
+"Standard\n"
+"High"
+msgstr ""
+"Auto\n"
+"Standard\n"
+"Élevé"
+
+#: ../data/options_legacy.glade.h:48 ../data/properties.glade.h:57
+msgid "Autodouble"
+msgstr "Autodouble"
+
+#: ../data/options_legacy.glade.h:49 ../data/properties.glade.h:58
+msgid "Automatic"
+msgstr "Automatique"
+
+#: ../data/options_legacy.glade.h:50 ../data/properties.glade.h:59
+msgid "Backdrops"
+msgstr "Arrière-plans"
+
+#: ../data/options_legacy.glade.h:51 ../data/properties.glade.h:60
+msgid "Beam size"
+msgstr "Taille des lignes"
+
+#: ../data/options_legacy.glade.h:52
+msgid "Beam size for vector games"
+msgstr "Taille des lignes pour les jeux vectoriels"
+
+#: ../data/options_legacy.glade.h:53 ../data/properties.glade.h:61
+msgid "Bezels"
+msgstr "Bezels"
+
+#: ../data/options_legacy.glade.h:54 ../data/properties.glade.h:63
+msgid "Bit per pixels:"
+msgstr "Bit par pixels:"
+
+#: ../data/options_legacy.glade.h:55 ../data/properties.glade.h:64
+msgid "Brightness correction"
+msgstr "Correction de la luminosité"
+
+#: ../data/options_legacy.glade.h:56
+msgid "Buffer size"
+msgstr "Taille du cache"
+
+#: ../data/options_legacy.glade.h:58 ../data/properties.glade.h:70
+msgid "DSP Plugin:"
+msgstr "Plugin DSP:"
+
+#: ../data/options_legacy.glade.h:59
+msgid "Display Options"
+msgstr "Options d'affichage"
+
+#: ../data/options_legacy.glade.h:60 ../data/properties.glade.h:76
+msgid "Do not apply rotation"
+msgstr "Ne pas appliquer de rotation"
+
+#: ../data/options_legacy.glade.h:61 ../data/properties.glade.h:79
+msgid "Draw antialiased vectors"
+msgstr "Dessiner des vecteurs antialiasés"
+
+#: ../data/options_legacy.glade.h:62
+msgid ""
+"Draw every frame\n"
+"Skip 1 out of 12 frames\n"
+"Skip 2 out of 12 frames\n"
+"Skip 3 out of 12 frames\n"
+"Skip 4 out of 12 frames\n"
+"Skip 5 out of 12 frames\n"
+"Skip 6 out of 12 frames\n"
+"Skip 7 out of 12 frames\n"
+"Skip 8 out of 12 frames\n"
+"Skip 9 out of 12 frames\n"
+"Skip 10 out of 12 frames\n"
+"Skip 11 out of 12 frames\n"
+"Skip 12 out of 12 frames"
+msgstr ""
+"Afficher toutes les trames\n"
+"Saute 1 trame sur 12\n"
+"Saute 2 trames sur 12\n"
+"Saute 3 trames sur 12\n"
+"Saute 4 trames sur 12\n"
+"Saute 5 trames sur 12\n"
+"Saute 6 trames sur 12\n"
+"Saute 7 trames sur 12\n"
+"Saute 8 trames sur 12\n"
+"Saute 9 trames sur 12\n"
+"Saute 10 trames sur 12\n"
+"Saute 11 trames sur 12\n"
+"Saute 12 trames sur 12"
+
+#: ../data/options_legacy.glade.h:75 ../data/properties.glade.h:81
+msgid "Draw only changes"
+msgstr "Dessiner seulement les changements"
+
+#: ../data/options_legacy.glade.h:76 ../data/properties.glade.h:82
+msgid "Draw translucent vectors"
+msgstr "Dessiner des vecteurs translucides"
+
+#: ../data/options_legacy.glade.h:77
+msgid "Effects & Corrections"
+msgstr "Effets et corrections"
+
+#: ../data/options_legacy.glade.h:78
+msgid "Enable antialiasing"
+msgstr "Activer l'antialiasing"
+
+#: ../data/options_legacy.glade.h:79
+msgid "Enable automatic save/restore"
+msgstr "Activer la sauvegarde et la restauration automatiques"
+
+#: ../data/options_legacy.glade.h:80
+msgid "Enable bilinear filtering"
+msgstr "Activer le filtrage bilinéaire"
+
+#: ../data/options_legacy.glade.h:81
+msgid "Enable double buffering"
+msgstr "Activer le cache double"
+
+#: ../data/options_legacy.glade.h:82 ../data/properties.glade.h:85
+msgid "Enable game cheats"
+msgstr "Activer les cheats"
+
+#: ../data/options_legacy.glade.h:83
+msgid "Enable mapping of Windows keys"
+msgstr "Activer le mapping des touches Windows"
+
+#: ../data/options_legacy.glade.h:86
+msgid "Enable vector antialiasing"
+msgstr "Activer l'antialiasing des vecteurs"
+
+#: ../data/options_legacy.glade.h:87
+msgid ""
+"Europe, 1 Slot (also been seen on a 4 slot)\n"
+"Europe, 4 Slot\n"
+"US, 2 Slot\n"
+"US, 6 Slot (V5?)\n"
+"Asia S3 Ver 6\n"
+"Japan, Ver 6 VS Bios\n"
+"Japan, Older\n"
+"Universe Bios v1.0 (hack)\n"
+"Universe Bios v1.1 (hack)\n"
+"Debug (Development) Bios\n"
+"AES Console (Asia?) Bios\n"
+"Universe Bios v1.2 (hack)"
+msgstr ""
+"Europe, 1 Slot (parfois rencontré sur 4 slots)\n"
+"Europe, 4 Slots\n"
+"US, 2 Slot\n"
+"US, 6 Slot (V5?)\n"
+"Asie S3 Ver 6\n"
+"Japon, Ver 6 VS Bios\n"
+"Japon, plus ancien\n"
+"Universe Bios v1.0 (hack)\n"
+"Universe Bios v1.1 (hack)\n"
+"Debug (Développement) Bios\n"
+"AES Console (Asie?) Bios\n"
+"Universe Bios v1.2 (hack)"
+
+#: ../data/options_legacy.glade.h:99 ../data/properties.glade.h:87
+msgid "Fake sound"
+msgstr "Son simulé"
+
+#: ../data/options_legacy.glade.h:100 ../data/properties.glade.h:89
+msgid "Flicker"
+msgstr "Scintillement"
+
+#: ../data/options_legacy.glade.h:101 ../data/properties.glade.h:90
+msgid "Flip screen left-right"
+msgstr "Retourner l'écran horizontalement"
+
+#: ../data/options_legacy.glade.h:102 ../data/properties.glade.h:91
+msgid "Flip screen upside-down"
+msgstr "Retourner l'écran verticalement"
+
+#: ../data/options_legacy.glade.h:104 ../data/properties.glade.h:95
+msgid "Fullscreen"
+msgstr "Plein écran"
+
+#: ../data/options_legacy.glade.h:105
+msgid "GL Texture size"
+msgstr "Taille de texture GL"
+
+#: ../data/options_legacy.glade.h:106 ../data/properties.glade.h:98
+msgid "Gamma correction"
+msgstr "Correction du gamma"
+
+#: ../data/options_legacy.glade.h:107 ../data/properties.glade.h:103
+msgid "Height scale:"
+msgstr "Échelle de hauteur:"
+
+#: ../data/options_legacy.glade.h:108 ../data/properties.glade.h:106
+msgid "Intensity"
+msgstr "Intensité"
+
+#: ../data/options_legacy.glade.h:109 ../data/properties.glade.h:108
+msgid "Joystick type:"
+msgstr "Type de joystick:"
+
+#: ../data/options_legacy.glade.h:110 ../data/properties.glade.h:112
+msgid "Log debug info"
+msgstr "Enregistrer les informations de déboguage"
+
+#: ../data/options_legacy.glade.h:111 ../data/properties.glade.h:113
+msgid "Max frameskip:"
+msgstr "Saut de trame max:"
+
+#: ../data/options_legacy.glade.h:112 ../data/properties.glade.h:116
+msgid "Mixer device:"
+msgstr "Périphérique de mixage:"
+
+#: ../data/options_legacy.glade.h:113 ../data/properties.glade.h:117
+msgid "Mixer plugin:"
+msgstr "Plugin de mixage:"
+
+#: ../data/options_legacy.glade.h:114 ../data/properties.glade.h:120
+msgid "Neo-Geo Bios:"
+msgstr "Bios Neo-Geo:"
+
+#: ../data/options_legacy.glade.h:115
+msgid ""
+"No joystick\n"
+"SDL joystick"
+msgstr ""
+"Pas de joystick\n"
+"Joystick SDL"
+
+#: ../data/options_legacy.glade.h:117
+msgid ""
+"None\n"
+"Smooth Scaling Effect\n"
+"Low Quality Filter\n"
+"High Quality Filter\n"
+"6-tap Filter with H-Scanlines\n"
+"Light Scanlines\n"
+"RGB Scanlines\n"
+"Deluxe Scanlines\n"
+"Black Scanlines"
+msgstr ""
+"Aucun\n"
+"Lissage de la mise à l'échelle\n"
+"Filtre basse qualité\n"
+"Filtre haute qualité\n"
+"Filtre 6-tap avec H-Scanlines\n"
+"Scanlines légères\n"
+"Scanlines RGB\n"
+"Scanlines Deluxe\n"
+"Scanlines noires"
+
+#: ../data/options_legacy.glade.h:126
+msgid "OSS\n"
+msgstr "OSS\n"
+
+#: ../data/options_legacy.glade.h:128
+msgid ""
+"OSS\n"
+"SDL\n"
+"aRTS"
+msgstr ""
+"OSS\n"
+"SDL\n"
+"aRTS"
+
+#: ../data/options_legacy.glade.h:132 ../data/properties.glade.h:122
+msgid "Overlays"
+msgstr "Overlays"
+
+#: ../data/options_legacy.glade.h:133
+msgid "Pause brightness"
+msgstr "Luminosité en pause"
+
+#: ../data/options_legacy.glade.h:134 ../data/properties.glade.h:125
+msgid "Rapid-fire"
+msgstr "Tir rapide"
+
+#: ../data/options_legacy.glade.h:137 ../data/properties.glade.h:130
+msgid "Sample rate:"
+msgstr "Taux d'échantillonage:"
+
+#: ../data/options_legacy.glade.h:138 ../data/properties.glade.h:131
+msgid "Scale video to height:"
+msgstr "Étirer la vidéo en hauteur:"
+
+#: ../data/options_legacy.glade.h:139
+msgid "Select keyboard grabbing"
+msgstr "Choisir la capture du clavier (grabbing)"
+
+#: ../data/options_legacy.glade.h:140
+msgid "Select mouse grabbing"
+msgstr "Choisir la capture de la souris (grabbing)"
+
+#: ../data/options_legacy.glade.h:141 ../data/properties.glade.h:132
+msgid "Show cursor"
+msgstr "Afficher le curseur"
+
+#: ../data/options_legacy.glade.h:142 ../data/properties.glade.h:133
+msgid "Skip disclaimer info"
+msgstr "Sauter l'info de non-responsabilité"
+
+#: ../data/options_legacy.glade.h:143 ../data/properties.glade.h:134
+msgid "Skip game info"
+msgstr "Sauter les info du jeu"
+
+#: ../data/options_legacy.glade.h:144 ../data/properties.glade.h:135
+msgid "Sleep when idle"
+msgstr "En sommeil quand inactif"
+
+#: ../data/options_legacy.glade.h:145 ../data/properties.glade.h:137
+msgid "Sound file name:"
+msgstr "Nom du fichier son:"
+
+#: ../data/options_legacy.glade.h:146
+msgid "Start in cabinet view"
+msgstr "Démarrer en vue cabinet"
+
+#: ../data/options_legacy.glade.h:147
+msgid "Stderr logfile"
+msgstr "Logfile Stderr"
+
+#: ../data/options_legacy.glade.h:148
+msgid "Stdout logfile"
+msgstr "Logfile Stdout"
+
+#: ../data/options_legacy.glade.h:150 ../data/properties.glade.h:140
+msgid "Timer based audio"
+msgstr "Audio basé sur un timer"
+
+#: ../data/options_legacy.glade.h:151 ../data/properties.glade.h:142
+msgid "UGCI (tm) Coin/Play support"
+msgstr "Support Coin/Play UGCI (tm)"
+
+#: ../data/options_legacy.glade.h:152 ../data/properties.glade.h:143
+msgid "USB PS Game Pads"
+msgstr "Gamepads USB PS"
+
+#: ../data/options_legacy.glade.h:153 ../data/properties.glade.h:145
+msgid "Use Scanlines"
+msgstr "Utiliser les Scanlines"
+
+#: ../data/options_legacy.glade.h:154 ../data/properties.glade.h:146
+msgid "Use additional game artwork:"
+msgstr "Utiliser l'artwork additionnel du jeu"
+
+#: ../data/options_legacy.glade.h:155 ../data/properties.glade.h:150
+msgid "Use keyboard LEDs as game indicators"
+msgstr "Utiliser les LED du clavier comme indicateurs de jeu"
+
+#: ../data/options_legacy.glade.h:156 ../data/properties.glade.h:153
+msgid "Use samples"
+msgstr "Utiliser des samples"
+
+#: ../data/options_legacy.glade.h:158
+msgid "Vector resolution:"
+msgstr "Résolution des vecteurs:"
+
+#: ../data/options_legacy.glade.h:160 ../data/properties.glade.h:156
+msgid "Width scale:"
+msgstr "Échelle de largeur"
+
+#: ../data/options_legacy.glade.h:162 ../data/properties.glade.h:164
+msgid "frames"
+msgstr "trames"
+
+#: ../data/properties.glade.h:9
+msgid "1:"
+msgstr "1:"
+
+#: ../data/properties.glade.h:10
+msgid "2:"
+msgstr "2:"
+
+#: ../data/properties.glade.h:11
+msgid "3:"
+msgstr "3:"
+
+#: ../data/properties.glade.h:12
+msgid "4:"
+msgstr "4:"
+
+#: ../data/properties.glade.h:13
+msgid "<b>Advanced options</b>"
+msgstr "<b>Options avancées</b>"
+
+#: ../data/properties.glade.h:14
+msgid "<b>Alsa sound system options</b>"
+msgstr "<b>Options du système son Alsa</b>"
+
+#: ../data/properties.glade.h:16
+msgid "<b>Buffer size</b>"
+msgstr "<b>Taille du cache</b>"
+
+#: ../data/properties.glade.h:17
+msgid "<b>CPU:</b>"
+msgstr "<b>CPU:</b>"
+
+#: ../data/properties.glade.h:18
+msgid "<b>Clone of:</b>"
+msgstr "<b>Clone de:</b>"
+
+#: ../data/properties.glade.h:19
+msgid "<b>Colors:</b>"
+msgstr "<b>Couleurs:</b>"
+
+#: ../data/properties.glade.h:20
+msgid "<b>Control Panel</b>"
+msgstr "<b>Panneau de contrôle</b>"
+
+#: ../data/properties.glade.h:24
+msgid "<b>FX (Glide) options</b>"
+msgstr "<b>Options FX (Glide)</b>"
+
+#: ../data/properties.glade.h:28
+msgid "<b>Key mapping</b>"
+msgstr "<b>Attribution de touches</b>"
+
+#: ../data/properties.glade.h:29
+msgid "<b>Keyboard</b>"
+msgstr "<b>Clavier</b>"
+
+#: ../data/properties.glade.h:30
+msgid "<b>Manufacturer:</b>"
+msgstr "<b>Fabricant:</b>"
+
+#: ../data/properties.glade.h:31
+msgid "<b>Mouse / Trackball</b>"
+msgstr "<b>Souris / Trackball</b>"
+
+#: ../data/properties.glade.h:32
+msgid "<b>OpenGL options</b>"
+msgstr "<b>Options OpenGL</b>"
+
+#: ../data/properties.glade.h:33
+msgid "<b>Other options</b>"
+msgstr "<b>Autres options</b>"
+
+#: ../data/properties.glade.h:34
+msgid "<b>Photon options</b>"
+msgstr "<b>Options Photon</b>"
+
+#: ../data/properties.glade.h:35
+msgid "<b>QNX options</b>"
+msgstr "<b>Options QNX</b>"
+
+#: ../data/properties.glade.h:37
+msgid "<b>Rom check:</b>"
+msgstr "<b>Vérification de Rom:</b>"
+
+#: ../data/properties.glade.h:39
+msgid "<b>SDL options</b>"
+msgstr "<b>Options SDL</b>"
+
+#: ../data/properties.glade.h:40
+msgid "<b>Sample Check:</b>"
+msgstr "<b>Vérification de sample:</b>"
+
+#: ../data/properties.glade.h:41
+msgid "<b>Screen:</b>"
+msgstr "<b>Écran:</b>"
+
+#: ../data/properties.glade.h:42
+msgid "<b>Sound:</b>"
+msgstr "<b>Son:</b>"
+
+#: ../data/properties.glade.h:44
+msgid "<b>Video mode</b>"
+msgstr "<b>Mode vidéo</b>"
+
+#: ../data/properties.glade.h:45
+msgid "<b>Volume attenuation</b>"
+msgstr "<b>Atténuation du volume</b>"
+
+#: ../data/properties.glade.h:46
+msgid "<b>X11 options</b>"
+msgstr "<b>Options X11</b>"
+
+#: ../data/properties.glade.h:47
+msgid "<b>Xinput joystick</b>"
+msgstr "<b>Joystick Xinput</b>"
+
+#: ../data/properties.glade.h:48
+msgid "<b>Xinput trackball</b>"
+msgstr "<b>Trackball Xinput</b>"
+
+#: ../data/properties.glade.h:49
+msgid "<b>Year:</b>"
+msgstr "<b>Année:</b>"
+
+#: ../data/properties.glade.h:50
+msgid "<b>aRts options</b>"
+msgstr "<b>Options aRts</b>"
+
+#: ../data/properties.glade.h:51
+msgid "Alphablending"
+msgstr "Alphablending"
+
+#: ../data/properties.glade.h:53
+msgid "Antialiasing"
+msgstr "Antialiasing"
+
+#: ../data/properties.glade.h:56
+msgid "Auto Resolution"
+msgstr "Résolution auto"
+
+#: ../data/properties.glade.h:62
+msgid "Bilinear filtering"
+msgstr "Filtrage bilinéaire"
+
+#: ../data/properties.glade.h:65
+msgid "Cabinet model:"
+msgstr "Modèle de cabinet:"
+
+#: ../data/properties.glade.h:66
+msgid "Card ID:"
+msgstr "ID de carte:"
+
+#: ../data/properties.glade.h:67
+msgid "Color modulation"
+msgstr "Modulation de couleur"
+
+#: ../data/properties.glade.h:68
+msgid "Controller:"
+msgstr "Contrôleur:"
+
+#: ../data/properties.glade.h:71
+msgid "Debug windows (for developers)"
+msgstr "Déboguage des fenêtres (pour développeurs)"
+
+#: ../data/properties.glade.h:73
+msgid "Device #:"
+msgstr "Périphérique #:"
+
+#: ../data/properties.glade.h:74
+msgid "Disable mode:"
+msgstr "Désactiver le mode:"
+
+#: ../data/properties.glade.h:77
+msgid "Double Buffering"
+msgstr "Cache Double"
+
+#: ../data/properties.glade.h:78
+msgid "Double buffering"
+msgstr "Cache double"
+
+#: ../data/properties.glade.h:80
+msgid "Draw bitmap"
+msgstr "Dessiner les bitmap"
+
+#: ../data/properties.glade.h:83
+msgid "Effect to use:"
+msgstr "Effet à utiliser:"
+
+#: ../data/properties.glade.h:84
+msgid "Enable Windows keys"
+msgstr "Activer les touches Windows"
+
+#: ../data/properties.glade.h:88
+msgid "File:"
+msgstr "Fichier:"
+
+#: ../data/properties.glade.h:92
+msgid "Force YUV mode:"
+msgstr "Forcer le mode YUV:"
+
+#: ../data/properties.glade.h:94
+msgid "Full Screen"
+msgstr "Plein écran"
+
+#: ../data/properties.glade.h:96
+msgid "GL extension #78"
+msgstr "Extension GL #78"
+
+#: ../data/properties.glade.h:97
+msgid "GLU library:"
+msgstr "Bibliothèque GLU:"
+
+#: ../data/properties.glade.h:99
+msgid "General"
+msgstr "Général"
+
+#: ../data/properties.glade.h:100
+msgid "Geometry:"
+msgstr "Géométrie:"
+
+#: ../data/properties.glade.h:101
+msgid "Grab keyboard"
+msgstr "Capturer le clavier"
+
+#: ../data/properties.glade.h:102
+msgid "Grab mouse"
+msgstr "Capturer la souris"
+
+#: ../data/properties.glade.h:104
+msgid "HotRod SE support"
+msgstr "Support HotRod SE"
+
+#: ../data/properties.glade.h:105
+msgid "HotRod support"
+msgstr "Support HotRod"
+
+#: ../data/properties.glade.h:107
+msgid "Joystick device prefix:"
+msgstr "Préfixe du périphérique de joystick:"
+
+#: ../data/properties.glade.h:110
+msgid "Keep aspect ratio:"
+msgstr "Garde les proportions"
+
+#: ../data/properties.glade.h:111
+msgid "Keyboard Layout type:"
+msgstr "Type de disposition du clavier:"
+
+#: ../data/properties.glade.h:114
+msgid "Method:"
+msgstr "Méthode:"
+
+#: ../data/properties.glade.h:118
+msgid ""
+"Name of pad device:\n"
+"(FM townpad)"
+msgstr ""
+"Nom du périphérique pad:\n"
+"(FM townpad)"
+
+#: ../data/properties.glade.h:121
+msgid "OpenGL library:"
+msgstr "Bibliothèque OpenGL"
+
+#: ../data/properties.glade.h:123
+msgid "PCM:"
+msgstr "PCM:"
+
+#: ../data/properties.glade.h:124
+msgid "Private colormap"
+msgstr "Table de couleur privée"
+
+#: ../data/properties.glade.h:126
+msgid "Rendering"
+msgstr "Rendu"
+
+#: ../data/properties.glade.h:127
+msgid "Resolution"
+msgstr "Résolution"
+
+#: ../data/properties.glade.h:128
+msgid "Resolution:"
+msgstr "Résolution:"
+
+#: ../data/properties.glade.h:129
+msgid "SDL modes:"
+msgstr "Modes SDL:"
+
+#: ../data/properties.glade.h:138
+msgid "Texture size:"
+msgstr "Taille de texture:"
+
+#: ../data/properties.glade.h:141
+msgid "True color blitter"
+msgstr "Blitter true color"
+
+#: ../data/properties.glade.h:144
+msgid "Use MIT shared memory"
+msgstr "Utiliser la mémoire partagée MIT"
+
+#: ../data/properties.glade.h:147
+msgid "Use additional options:"
+msgstr "Utiliser des options additionelles:"
+
+#: ../data/properties.glade.h:148
+msgid "Use config name:"
+msgstr "Utiliser un nom de configuration:"
+
+#: ../data/properties.glade.h:149
+msgid "Use fixed resolution:"
+msgstr "Utiliser une résolution fixe:"
+
+#: ../data/properties.glade.h:151
+msgid "Use mouse"
+msgstr "Utiliser la souris"
+
+#: ../data/properties.glade.h:152
+msgid "Use preferred device"
+msgstr "Utiliser le périphérique préféré"
+
+#: ../data/properties.glade.h:157
+msgid "Window size:"
+msgstr "Taille de fenêtre:"
+
+#: ../data/properties.glade.h:158
+msgid "X Synch"
+msgstr "Synchronisation X"
+
+#: ../data/properties.glade.h:159
+msgid "X-based device:"
+msgstr "Périphérique basé sur X"
+
+#: ../data/properties.glade.h:160
+msgid "XIL multi-threading"
+msgstr "Multi-threading XIL"
+
+#: ../data/properties.glade.h:161
+msgid "XIL scaling"
+msgstr "Mise à l'échelle XIL"
+
+#: ../data/properties.glade.h:162
+msgid "aRts buffer delay time:"
+msgstr "Délai temporel du cache aRts:"
+
+#: ../data/rom_info.glade.h:1
+msgid "<b>About this ROM</b>"
+msgstr "<b>À propos de cette ROM</b>"
+
+#: ../data/rom_info.glade.h:2
+msgid "<b>Audit Details</b>"
+msgstr "<b>Détails de l'audit</b>"
+
+#: ../data/rom_info.glade.h:3
+msgid "<b>Screen Details</b>"
+msgstr "<b>Détails de l'écran</b>"
+
+#: ../data/rom_info.glade.h:4
+msgid "<b>Technical Details</b>"
+msgstr "<b>Détails techniques</b>"
+
+#: ../data/rom_info.glade.h:5
+msgid "CPU:"
+msgstr "CPU:"
+
+#: ../data/rom_info.glade.h:6
+msgid "Clone of:"
+msgstr "Clone de:"
+
+#: ../data/rom_info.glade.h:7
+msgid "Colors:"
+msgstr "Couleurs:"
+
+#: ../data/rom_info.glade.h:9
+msgid "Manufacturer:"
+msgstr "Fabricant:"
+
+#: ../data/rom_info.glade.h:10
+msgid "Rom check:"
+msgstr "Vérification de Rom:"
+
+#: ../data/rom_info.glade.h:11
+msgid "Sample Check:"
+msgstr "Vérification de sample:"
+
+#: ../data/rom_info.glade.h:12
+msgid "Screen:"
+msgstr "Écran:"
+
+#: ../data/rom_info.glade.h:13
+msgid "Sound:"
+msgstr "Son:"
+
+#: ../data/rom_info.glade.h:14
+msgid "Year:"
+msgstr "Année:"
+
+#: ../data/rom_info.glade.h:16
+msgid "label"
+msgstr "label"
+
+#: ../data/sidebar.glade.h:1
+msgid "Cabinet"
+msgstr "Cabinet"
+
+#: ../data/sidebar.glade.h:2
+msgid "Control Panel"
+msgstr "Panneau de contrôle"
+
+#: ../data/sidebar.glade.h:3
+msgid "Flyer"
+msgstr "Flyer"
+
+#: ../data/sidebar.glade.h:4
+msgid "Marquee"
+msgstr "Marquee"
+
+#: ../data/sidebar.glade.h:5
+msgid "Snapshot"
+msgstr "Capture d'écran"
+
+#: ../data/sidebar.glade.h:6
+msgid "Title Snapshot"
+msgstr "Capture d'écran titre"
+
+#: ../gmameui.desktop.in.h:1
+msgid "Arcade Machine Emulator Frontend"
+msgstr "Interface graphique d'émulateur de machine d'arcade"
+
+#: ../gmameui.desktop.in.h:2
+msgid "GMAMEUI Arcade Machine Emulator Frontend"
+msgstr "GMAMEUI Interface graphique d'Émulateur de Machine d'Arcade"
+
+#: ../gmameui.desktop.in.h:3
+msgid "Play and browse classic arcade games"
+msgstr "Naviguer et jouer à des jeux d'arcade classiques"
+
+#~ msgid "Found file name %s with CRC: %u, size %i"
+#~ msgstr "Nom de fichier %s trouvé, avec CRC: %u, taille %i"
+
+#~ msgid "Attempting to uncompress %s"
+#~ msgstr "Tentative de décompression de %s"
+
+#~ msgid "Error while uncompressing %s: %s"
+#~ msgstr "Erreur à la décompression %s: %s"
+
+#~ msgid "Error - cannot open zip file %s"
+#~ msgstr "Erreur - impossible d'ouvrir le fichier zip %s"
+
+#~ msgid "Network game options"
+#~ msgstr "Options de jeu en réseau"
+
+#~ msgid "Network Mode"
+#~ msgstr "Mode pour le réseau"
+
+#~ msgid "Client"
+#~ msgstr "Client"
+
+#~ msgid "Server"
+#~ msgstr "Serveur"
+
+#~ msgid "Host[:Port] : "
+#~ msgstr "Hôte[:Port] : "
+
+#~ msgid "Number of players : "
+#~ msgstr "Nombre de joueurs : "
+
+#~ msgid "Use NetMapKey"
+#~ msgstr "Utiliser NetMapKey"
+
+#~ msgid "Statedebug"
+#~ msgstr "Statedebug"
+
+#~ msgid "Bind port:"
+#~ msgstr "Bind port:"
+
+#~ msgid "Perform network input sync in advance"
+#~ msgstr "Effectuer la synchronisation des entrées réseau à l'avance"
diff --git a/po/it.po b/po/it.po
index 2b6ee55..82bbac4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,35 +7,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-18 19:54+0200\n"
-"PO-Revision-Date: 2008-09-16 22:55+0200\n"
+"POT-Creation-Date: 2009-06-28 12:23+0200\n"
+"PO-Revision-Date: 2009-06-28 12:23+0200\n"
 "Last-Translator: Ugo Viti <ugo.viti at initzero.it>\n"
 "Language-Team: Ugo Viti <ugo.viti at initzero.it>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/about.c:51
+#: ../src/about.c:50
 msgid "translator-credits"
 msgstr "Ugo Viti <ugo.viti at initzero.it>"
 
-#: ../src/about.c:59 ../src/about.c:236
-msgid "Copyright (c) 2007-2008 Andrew Burton"
-msgstr "Copyright (c) 2007-2008 Andrew Burton"
+#: ../src/about.c:58 ../src/about.c:237
+msgid "Copyright (c) 2007-2009 Andrew Burton"
+msgstr "Copyright (c) 2007-2009 Andrew Burton"
 
-#: ../src/about.c:61 ../src/about.c:232
+#: ../src/about.c:60 ../src/about.c:233
 msgid "A program to play MAME under Linux"
 msgstr "Un programma per giocare con il MAME sotto GNU/Linux"
 
-#: ../src/about.c:106 ../src/about.c:206
+#: ../src/about.c:105 ../src/about.c:207
 msgid "Credits"
 msgstr "Crediti"
 
-#: ../src/about.c:122
+#: ../src/about.c:121
 msgid "Developers"
 msgstr "Sviluppatori"
 
-#: ../src/about.c:123
+#: ../src/about.c:122
 msgid ""
 "Andrew Burton\n"
 "Code based on GXMame\n"
@@ -53,72 +53,82 @@ msgstr ""
 "Priit Laes <x-laes at users.sourceforge.net>\n"
 "William Jon McCann <mccann at jhu.edu>\n"
 
-#: ../src/about.c:134
+#: ../src/about.c:133
 msgid "Translators"
 msgstr "Traduttori"
 
-#: ../src/about.c:135
+#: ../src/about.c:134
 msgid ""
 "The following people translated GMAMEUI:\n"
 "Brazilian Portugese (pt_BR) - Alfredo Jr <junix at linuxinabox.org>\n"
 "Italian (it) - Ugo Viti <ugo.viti at initzero.it>\n"
+"Swedish (sv) - Daniel Nylander <dnylander at users.sourceforge.net>\n"
+"French (fr) - Loïc Martin <loic.martin3 at gmail.com>"
 msgstr ""
 "Le seguenti persone hanno tradotto GMAMEUI:\n"
 "Brazilian Portugese (pt_BR) - Alfredo Jr <junix at linuxinabox.org>\n"
 "Italian (it) - Ugo Viti <ugo.viti at initzero.it>\n"
+"Swedish (sv) - Daniel Nylander <dnylander at users.sourceforge.net>\n"
+"French (fr) - Loïc Martin <loic.martin3 at gmail.com>"
 
-#: ../src/about.c:202
+#: ../src/about.c:203
 msgid "About GMAMEUI"
 msgstr "A riguardo di GMAMEUI"
 
-#: ../src/about.c:224
+#: ../src/about.c:225
 msgid "GMAMEUI"
 msgstr "GMAMEUI"
 
-#: ../src/audit.c:562
+#: ../src/audit.c:556
 msgid "Don't know how to verify roms with this version of xmame."
 msgstr "Non so come verificare le ROMs con questa versione di GMAMEUI"
 
-#: ../src/callbacks.c:140 ../src/options.c:778 ../data/properties.glade.h:75
+#. Add each of the notebooks
+#: ../src/callbacks.c:136 ../src/mame_options_legacy_dialog.c:822
+#: ../data/properties.glade.h:75
 msgid "Display"
 msgstr "Video"
 
-#: ../src/callbacks.c:142
+#: ../src/callbacks.c:138 ../data/options_legacy.glade.h:131
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/callbacks.c:144 ../src/interface.c:744 ../src/options.c:1755
-#: ../data/properties.glade.h:136
+#. mame_options_legacy_dialog_add_page (dlg, "OpenGLVBox", _("OpenGL"), "gmameui-display-toolbar");
+#: ../src/callbacks.c:140 ../src/interface.c:621
+#: ../src/mame_options_legacy_dialog.c:824 ../data/properties.glade.h:136
 msgid "Sound"
 msgstr "Sonoro"
 
-#: ../src/callbacks.c:146
+#: ../src/callbacks.c:142 ../src/mame_options_legacy_dialog.c:825
 msgid "Input"
 msgstr "Ingressi"
 
-#: ../src/callbacks.c:148
+#: ../src/callbacks.c:144
 msgid "Performance"
 msgstr "Prestazioni"
 
-#: ../src/callbacks.c:150 ../src/options.c:2418 ../data/properties.glade.h:115
+#. mame_options_legacy_dialog_add_page (dlg, "PerformanceVBox", _("Performance"), "gmameui-general-toolbar");
+#: ../src/callbacks.c:146 ../src/mame_options_legacy_dialog.c:827
+#: ../data/properties.glade.h:115
 msgid "Miscellaneous"
 msgstr "Varie"
 
 #. FIXME: Make the debugging page last
-#: ../src/callbacks.c:152 ../src/mame_options_dialog.c:130
-#: ../src/mame_options_dialog.c:133
+#: ../src/callbacks.c:148 ../src/mame_options_dialog.c:129
+#: ../src/mame_options_dialog.c:132 ../src/mame_options_legacy_dialog.c:721
+#: ../src/mame_options_legacy_dialog.c:724
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../src/callbacks.c:208
+#: ../src/callbacks.c:200
 msgid "No xmame executables defined"
 msgstr "Nessun eseguibile MAME definito"
 
-#: ../src/callbacks.c:344
+#: ../src/callbacks.c:326
 msgid "GMAMEUI Help could not be started"
 msgstr "L'aiuto di GMAMEUI non può essere avviato"
 
-#: ../src/callbacks.c:346
+#: ../src/callbacks.c:328
 msgid ""
 "The Help file could not be opened. This will happen if the version of GTK is "
 "not at least 2.13 and libgnome support has not been compiled in."
@@ -127,93 +137,143 @@ msgstr ""
 "GTKnon è almeno alla versione 2.13 ed il supporto libgnome non è stato "
 "compilato"
 
-#: ../src/callbacks.c:357
+#: ../src/callbacks.c:339
 msgid "There was an error opening the Help file"
 msgstr "È avvenuto un errore mentre stavo aprendo il file di aiuto"
 
-#: ../src/directories.c:125
+#: ../src/cell-renderer-captioned-image.c:215
+msgid "Text"
+msgstr "Testo"
+
+#: ../src/cell-renderer-captioned-image.c:216
+msgid "Text to render"
+msgstr "Testo da renderizzare"
+
+#: ../src/cell-renderer-captioned-image.c:222
+msgid "Pixbuf Object"
+msgstr "Oggetto Pixbuf"
+
+#: ../src/cell-renderer-captioned-image.c:223
+msgid "The pixbuf to render."
+msgstr "Il pixbuf da renderizzare."
+
+#: ../src/directories.c:338 ../data/directories.glade.h:12
+msgid "Directories Selection"
+msgstr "Selezione Percorsi"
+
+#: ../src/directories.c:374
+msgid "No MAME executables have been chosen"
+msgstr "Non è stato scelto alcun eseguibile MAME"
+
+#: ../src/directories.c:377
+msgid ""
+"Without a MAME executable, you will not be able to emulate any ROMs. Are you "
+"sure you want to close the window?"
+msgstr ""
+"Senza un eseguibile MAME, non sarai in grado di emulare alcuna ROM. Sei "
+"sicuro di voler chiudere la finestra?"
+
+#: ../src/directories.c:388
+msgid "No ROM directories have been chosen"
+msgstr "Nessuna cartella contenente ROM è stata scelta"
+
+#: ../src/directories.c:391
+msgid ""
+"Without any ROM directories, you will not be able to emulate any ROMs. Are "
+"you sure you want to close the window?"
+msgstr ""
+"Senza una cartella delle ROM, non sarai in grado di emulare alcuna ROM. Sei "
+"sicuro di voler chiudere la finestra?"
+
+#: ../src/directories.c:473
 msgid "Browse for Folder"
 msgstr "Naviga per Cartella"
 
-#: ../src/directories.c:162
+#: ../src/directories.c:519
 msgid "Browse for File"
 msgstr "Naviga per File"
 
-#: ../src/directories.c:697
-msgid "No valid xmame executables found"
-msgstr "Nessun eseguibile MAME trovato"
+#. Create new directory file chooser
+#: ../src/directories.c:556
+msgid "Select directory"
+msgstr "Seleziona cartella"
+
+#. Create new directory file chooser
+#: ../src/directories.c:608
+msgid "Select MAME executable"
+msgstr "Seleziona un eseguibile MAME"
 
 #. Now add the categories
-#: ../src/filters_list.c:202 ../src/interface.c:540 ../src/interface.c:545
-#: ../src/interface.c:555 ../src/interface.c:573 ../src/interface.c:588
+#: ../src/filters_list.c:202 ../src/interface.c:599 ../src/interface.c:600
+#: ../src/interface.c:601
 msgid "Available"
 msgstr "Disponibili"
 
-#: ../src/filters_list.c:203 ../src/interface.c:604 ../src/interface.c:617
-#: ../src/interface.c:630 ../src/interface.c:643 ../src/interface.c:656
-#: ../src/interface.c:669 ../src/interface.c:682 ../src/interface.c:695
+#: ../src/filters_list.c:203 ../src/interface.c:604 ../src/interface.c:605
+#: ../src/interface.c:606
+msgid "Status"
+msgstr "Stato"
+
+#: ../src/filters_list.c:204 ../src/interface.c:609 ../src/interface.c:610
+#: ../src/interface.c:611 ../src/interface.c:612 ../src/interface.c:613
+#: ../src/interface.c:614 ../src/interface.c:615 ../src/interface.c:616
 msgid "Architecture"
 msgstr "Architetture"
 
-#: ../src/filters_list.c:204 ../src/interface.c:739 ../src/interface.c:753
-#: ../src/interface.c:767
+#: ../src/filters_list.c:205 ../src/interface.c:619 ../src/interface.c:620
+#: ../src/interface.c:621 ../src/interface.c:622
 msgid "Imperfect"
 msgstr "Difettosi"
 
-#: ../src/filters_list.c:205 ../src/interface.c:781 ../src/interface.c:794
-#: ../src/interface.c:808 ../src/interface.c:822 ../src/interface.c:835
-#: ../src/interface.c:848 ../src/interface.c:889 ../src/interface.c:903
+#: ../src/filters_list.c:206 ../src/interface.c:625 ../src/interface.c:626
+#: ../src/interface.c:627 ../src/interface.c:628 ../src/interface.c:629
+#: ../src/interface.c:630 ../src/interface.c:633 ../src/interface.c:634
 msgid "Game Details"
 msgstr "Dettagli"
 
-#: ../src/filters_list.c:206 ../src/interface.c:710 ../src/interface.c:723
+#: ../src/filters_list.c:207 ../src/interface.c:637 ../src/interface.c:638
 msgid "Custom"
 msgstr "Personali"
 
-#: ../src/filters_list.c:207 ../src/gmameui-gamelist-view.c:81
-#: ../src/interface.c:928 ../src/mame_options_dialog.c:81
-#: ../data/gmameui_prefs.glade.h:6
+#: ../src/filters_list.c:208 ../src/gmameui-gamelist-view.c:466
+#: ../src/interface.c:701 ../src/mame_options_dialog.c:80
+#: ../src/mame_options_legacy_dialog.c:672 ../data/gmameui_prefs.glade.h:5
 msgid "Category"
 msgstr "Categorie"
 
-#: ../src/filters_list.c:208 ../src/gmameui-gamelist-view.c:79
-#: ../src/interface.c:949 ../data/gmameui_prefs.glade.h:20
+#: ../src/filters_list.c:209 ../src/gmameui-gamelist-view.c:464
+#: ../src/interface.c:722 ../data/gmameui_prefs.glade.h:19
 msgid "Version"
 msgstr "Versione"
 
-#: ../src/game_list.c:312 ../src/io.c:221 ../src/io.c:224
-#: ../src/properties.c:370
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: ../src/game_list.c:358
+#: ../src/game_list.c:342
 #, c-format
 msgid "Loading gamelist %s"
 msgstr "Caricamento lista giochi %s"
 
-#: ../src/game_list.c:389
+#: ../src/game_list.c:374
 msgid "Game list is corrupted."
 msgstr "La lista dei giochi è corrotta."
 
-#: ../src/game_list.c:401
+#: ../src/game_list.c:386
 msgid "Out of memory while loading gamelist"
 msgstr "Fine della memoria durante il caricamento della lista dei giochi"
 
-#: ../src/game_list.c:530
+#: ../src/game_list.c:507
 #, c-format
 msgid "Loaded %d roms by %d manufacturers covering %d years."
 msgstr "Caricate %d ROMs di %d produttori per %d anni."
 
-#: ../src/game_list.c:532
+#: ../src/game_list.c:509
 #, c-format
 msgid "with %d games supporting samples."
 msgstr "con %d giochi che supportano i suoni campionati."
 
-#: ../src/game_list.c:626
+#: ../src/game_list.c:651
 msgid "Saving gamelist."
 msgstr "Sto salvando la lista dei giochi."
 
-#: ../src/game_list.c:738
+#: ../src/game_list.c:757
 msgid ""
 "Could not recognise the gamelist version.\n"
 "Do you want to rebuild the gamelist?"
@@ -221,7 +281,7 @@ msgstr ""
 "Non posso riconoscere la versione della lista dei giochi.\n"
 "Vuoi ricostruire la lista dei giochi?"
 
-#: ../src/game_list.c:747
+#: ../src/game_list.c:766
 msgid ""
 "Gamelist not available,\n"
 "Do you want to build the gamelist?"
@@ -229,7 +289,7 @@ msgstr ""
 "Lista giochi non disponibile,\n"
 "Vuoi costruirla?"
 
-#: ../src/game_list.c:756
+#: ../src/game_list.c:775
 msgid ""
 "Gamelist was created with an older version of GMAMEUI.\n"
 "The gamelist is not supported.\n"
@@ -239,7 +299,7 @@ msgstr ""
 "La lista giochi non è supportata.\n"
 "Vuoi ricostruire la lista dei giochi?"
 
-#: ../src/game_list.c:769
+#: ../src/game_list.c:788
 #, c-format
 msgid ""
 "The gamelist is from:\n"
@@ -254,110 +314,105 @@ msgstr ""
 "%s %s\n"
 "Vuoi ricostruire la lista dei giochi?"
 
-#: ../src/gmameui.c:86
-msgid "No xmame executable found"
+#: ../src/gmameui.c:97
+msgid "No MAME executables were found"
 msgstr "Nessun eseguibile MAME trovato"
 
-#: ../src/gmameui.c:148
+#: ../src/gmameui.c:99
+msgid "Do you want to locate a MAME executable now?"
+msgstr "Vuoi trovare un eseguibile MAME ora?"
+
+#: ../src/gmameui.c:156
 msgid "Initialising list of possible MAME executable options"
 msgstr "Sto inizializzando la lista delle possibili opzioni di MAME"
 
-#: ../src/gmameui.c:151
+#: ../src/gmameui.c:159
 msgid "Initialising MAME executables"
 msgstr "Sto inizializzando gli eseguibili MAME"
 
-#: ../src/gmameui.c:169
+#: ../src/gmameui.c:174
 #, c-format
 msgid "Adding executable from preferences file: %s"
 msgstr "Sto aggiungendo l'eseguibile dal file delle preferenze: %s"
 
-#: ../src/gmameui.c:177
-#, c-format
-msgid "Current exec set to %s"
-msgstr "Eseguibile corrente impostato a %s"
-
-#: ../src/gmameui.c:183
+#: ../src/gmameui.c:197
 #, c-format
 msgid "Time to initialise: %.02f seconds"
 msgstr "Tempo di inizializzazione: %.02f secondi"
 
-#: ../src/gmameui.c:191
+#: ../src/gmameui.c:206
 msgid "gamelist not found, need to rebuild one"
 msgstr "lista giochi non trovata, devo ricostruirne una"
 
-#: ../src/gmameui.c:195
+#: ../src/gmameui.c:210
 #, c-format
 msgid "Time to load gamelist: %.02f seconds"
 msgstr "Tempo per caricare la lista giochi: %.02f secondi"
 
-#: ../src/gmameui.c:198
+#: ../src/gmameui.c:213
 msgid "games.ini not loaded, using default values"
 msgstr "file 'games.ini' non trovato, userò i valori predefiniti"
 
-#: ../src/gmameui.c:200
+#: ../src/gmameui.c:216
 #, c-format
 msgid "Time to load games ini: %.02f seconds"
 msgstr "Tempo per caricare ini giochi: %.02f secondi"
 
-#: ../src/gmameui.c:203
+#: ../src/gmameui.c:219
 msgid "catver not loaded, using default values"
 msgstr "file 'catver' non trovato, userò i valori predefiniti"
 
-#: ../src/gmameui.c:207
-msgid "default options not loaded, using default values"
-msgstr "opzioni di default non caricate, userò i valori predefiniti"
-
-#: ../src/gmameui.c:211
+#: ../src/gmameui.c:224
 #, c-format
 msgid "Time to initialise GMAMEUI: %.02f seconds"
 msgstr "Per per inizializzare GMAMEUI: %.02f secondi"
 
-#: ../src/gmameui.c:226
+#: ../src/gmameui.c:239
 #, c-format
 msgid "Joystick %s found"
 msgstr "Trovato Joystick %s"
 
-#: ../src/gmameui.c:228
+#: ../src/gmameui.c:241
 msgid "No Joystick found"
 msgstr "Nessun Joystick trovato"
 
-#: ../src/gmameui.c:401 ../src/gmameui.c:409
+#: ../src/gmameui.c:465 ../src/gmameui.c:473
 #, c-format
 msgid "Loading %s:"
 msgstr "Sto Caricando %s:"
 
-#: ../src/gmameui.c:499
+#: ../src/gmameui.c:563
 #, c-format
 msgid "Error with MAME graphics creation: %s"
 msgstr "Errore con la creazione della grafica di MAME: %s"
 
-#: ../src/gmameui.c:522
+#: ../src/gmameui.c:586
 msgid "GMAMEUI could not load the ROM"
 msgstr "GMAMEUI non può caricare la ROM"
 
-#: ../src/gmameui.c:523
+#: ../src/gmameui.c:587
 msgid "The following ROMs were not found:\n"
 msgstr "Le seguenti ROMs non sono state trovate:\n"
 
-#: ../src/gmameui.c:525
+#: ../src/gmameui.c:589
 msgid "MAME did not start successfully"
 msgstr "MAME non si è avviato correttamente"
 
-#: ../src/gmameui.c:526
+#: ../src/gmameui.c:590
 msgid "The following errors were reported:\n"
 msgstr "Sono stati riscontrati i seguenti errori:\n"
 
-#: ../src/gmameui.c:709
+#: ../src/gmameui.c:779
 #, c-format
 msgid "Could not open '%s' as valid input file"
 msgstr "Non posso aprire '%s' come un file di input valido"
 
-#: ../src/gmameui.c:777
+#: ../src/gmameui.c:825
 msgid "Exiting GMAMEUI..."
 msgstr "Sto uscendo da GMAMEUI..."
 
 #. FIXME TODO gtk_widget_destroy (MainWindow);
-#: ../src/gmameui.c:806
+#: ../src/gmameui.c:858
 msgid "Finished cleaning up GMAMEUI"
 msgstr "Ho finito di ripulire GMAMEUI"
 
@@ -365,940 +420,763 @@ msgstr "Ho finito di ripulire GMAMEUI"
 msgid "Auditing MAME ROMs"
 msgstr "Sto analizzando le ROMs del MAME"
 
-#: ../src/gmameui-audit-dlg.c:273 ../data/audit_window.glade.h:6
+#: ../src/gmameui-audit-dlg.c:274 ../data/audit_window.glade.h:6
 msgid "Auditing ROMs"
 msgstr "Sto analizzando le ROMs"
 
-#: ../src/gmameui-audit-dlg.c:315
+#: ../src/gmameui-audit-dlg.c:316
 msgid "Audit Stopped"
 msgstr "Analisi interrotta"
 
-#: ../src/gmameui-audit-dlg.c:316
+#: ../src/gmameui-audit-dlg.c:317
 msgid "Stopped"
 msgstr "Interrotta"
 
-#: ../src/gmameui-audit-dlg.c:440
+#: ../src/gmameui-audit-dlg.c:444
 #, c-format
 msgid "Auditing romset %s"
 msgstr "Sto analizzando le ROMs di: %s"
 
-#: ../src/gmameui-audit-dlg.c:454
+#: ../src/gmameui-audit-dlg.c:455
 #, c-format
 msgid "Auditing sampleset %s"
 msgstr "Sto analizzando i campioni sonori di: %s"
 
-#: ../src/gmameui-audit-dlg.c:508 ../src/gmameui-audit-dlg.c:511
+#: ../src/gmameui-audit-dlg.c:507 ../src/gmameui-audit-dlg.c:510
 msgid "Audit done"
 msgstr "Analisi eseguita"
 
-#: ../src/gmameui-audit-dlg.c:509
+#: ../src/gmameui-audit-dlg.c:508
 msgid "Done"
 msgstr "Eseguito"
 
-#: ../src/gmameui-gamelist-view.c:45
+#: ../src/gmameui-gamelist-view.c:430
 msgid "Game"
 msgstr "Gioco"
 
-#: ../src/gmameui-gamelist-view.c:47 ../data/directories.glade.h:23
+#: ../src/gmameui-gamelist-view.c:432 ../data/directories.glade.h:23
 msgid "ROMs"
 msgstr "ROMs"
 
-#: ../src/gmameui-gamelist-view.c:49 ../src/interface.c:799
-#: ../data/directories.glade.h:24 ../data/gmameui_prefs.glade.h:17
+#: ../src/gmameui-gamelist-view.c:434 ../src/interface.c:627
+#: ../data/directories.glade.h:24 ../data/gmameui_prefs.glade.h:16
 msgid "Samples"
 msgstr "Campioni sonori"
 
-#: ../src/gmameui-gamelist-view.c:51 ../data/gmameui_prefs.glade.h:9
+#: ../src/gmameui-gamelist-view.c:436 ../data/gmameui_prefs.glade.h:7
 msgid "Directory"
 msgstr "Cartella"
 
-#: ../src/gmameui-gamelist-view.c:53 ../src/interface.c:715
+#: ../src/gmameui-gamelist-view.c:438 ../src/interface.c:638
 msgid "Played"
 msgstr "Giocati"
 
-#: ../src/gmameui-gamelist-view.c:55 ../data/gmameui_prefs.glade.h:15
+#: ../src/gmameui-gamelist-view.c:440 ../data/gmameui_prefs.glade.h:13
 msgid "Manufacturer"
 msgstr "Produttore"
 
-#: ../src/gmameui-gamelist-view.c:57 ../data/gmameui_prefs.glade.h:21
+#: ../src/gmameui-gamelist-view.c:442 ../data/gmameui_prefs.glade.h:21
 msgid "Year"
 msgstr "Anno"
 
-#: ../src/gmameui-gamelist-view.c:59 ../data/gmameui_prefs.glade.h:8
+#: ../src/gmameui-gamelist-view.c:444 ../data/gmameui_prefs.glade.h:6
 msgid "Clone of"
 msgstr "Clone di"
 
-#: ../src/gmameui-gamelist-view.c:61 ../data/gmameui_prefs.glade.h:10
+#. Imperfect filters
+#: ../src/gmameui-gamelist-view.c:446 ../src/interface.c:619
+#: ../data/gmameui_prefs.glade.h:8
 msgid "Driver"
 msgstr "Driver"
 
-#. Available / Not Available
-#: ../src/gmameui-gamelist-view.c:63
-msgid "Status"
-msgstr "Stato"
-
-#: ../src/gmameui-gamelist-view.c:65
+#: ../src/gmameui-gamelist-view.c:448
 msgid "Rom of"
 msgstr "ROM di"
 
-#. Working / Not Working
-#: ../src/gmameui-gamelist-view.c:67
+#: ../src/gmameui-gamelist-view.c:452
 msgid "Driver Status"
 msgstr "Stato Driver"
 
-#: ../src/gmameui-gamelist-view.c:69
+#: ../src/gmameui-gamelist-view.c:454
 msgid "Driver Colors"
 msgstr "Colori Driver"
 
-#: ../src/gmameui-gamelist-view.c:71
+#: ../src/gmameui-gamelist-view.c:456
 msgid "Driver Sound"
 msgstr "Suoni Driver"
 
-#: ../src/gmameui-gamelist-view.c:73
+#: ../src/gmameui-gamelist-view.c:458
 msgid "Driver Graphics"
 msgstr "Grafica Driver"
 
-#: ../src/gmameui-gamelist-view.c:75
+#: ../src/gmameui-gamelist-view.c:460
 msgid "Players"
 msgstr "Giocatori"
 
-#: ../src/gmameui-gamelist-view.c:77
+#: ../src/gmameui-gamelist-view.c:462
 msgid "Buttons"
 msgstr "Bottoni"
 
-#: ../src/gmameui-gamelist-view.c:83
+#: ../src/gmameui-gamelist-view.c:468
 msgid "Favorite"
 msgstr "Preferito"
 
-#: ../src/gmameui-gamelist-view.c:85
+#: ../src/gmameui-gamelist-view.c:470
 msgid "Channels"
 msgstr "Canali"
 
-#: ../src/gmameui-gamelist-view.c:87 ../src/interface.c:687
+#: ../src/gmameui-gamelist-view.c:472 ../src/interface.c:616
 msgid "BIOS"
 msgstr "BIOS"
 
-#: ../src/gmameui-gamelist-view.c:352
-#, c-format
-msgid "Hide \"%s\" Column"
-msgstr "Nascondi la colonna \"%s\""
-
-#: ../src/gmameui-gamelist-view.c:718
-msgid "Wait..."
-msgstr "Aspetta..."
-
-#: ../src/gmameui-gamelist-view.c:779 ../src/gui.c:1395
+#: ../src/gmameui-gamelist-view.c:592 ../src/gmameui-gamelist-view.c:1466
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/gmameui-gamelist-view.c:779 ../src/gui.c:1395
+#: ../src/gmameui-gamelist-view.c:592 ../src/gmameui-gamelist-view.c:1466
 msgid "No"
 msgstr "No"
 
-#. Status Bar Message
-#: ../src/gmameui-gamelist-view.c:890
+#: ../src/gmameui-gamelist-view.c:682
+msgid "game"
+msgstr "gioco"
+
+#: ../src/gmameui-gamelist-view.c:682
 msgid "games"
 msgstr "giochi"
 
-#: ../src/gmameui-gamelist-view.c:890
-msgid "game"
-msgstr "gioco"
+#: ../src/gmameui-gamelist-view.c:704
+msgid "Wait..."
+msgstr "Aspetta..."
 
-#: ../src/gui.c:488
+#: ../src/gmameui-gamelist-view.c:1079
 #, c-format
-msgid "Found file name %s with CRC: %u, size %i"
-msgstr "Trovato nome file: %s, CRC %u, dimensione %i"
+msgid "Hide \"%s\" Column"
+msgstr "Nascondi la colonna \"%s\""
 
-#: ../src/gui.c:496
-#, c-format
-msgid "Attempting to uncompress %s"
-msgstr "Sto scompattando %s"
+#: ../src/gmameui-rominfo-dlg.c:68 ../src/gmameui-rominfo-dlg.c:71
+msgid "Can't audit game"
+msgstr "Non posso analizzare il gioco"
 
-#: ../src/gui.c:502
-msgid "Loaded pixbuf"
-msgstr "Pixbuf caricato"
+#: ../src/gmameui-rominfo-dlg.c:73 ../src/gmameui-rominfo-dlg.c:299
+msgid "None required"
+msgstr "Non necessario"
 
-#: ../src/gui.c:504 ../src/gui.c:526
-#, c-format
-msgid "Error while uncompressing %s: %s"
-msgstr "Errore durante la compattazione %s: %s"
+#: ../src/gmameui-rominfo-dlg.c:103 ../src/interface.c:606
+#: ../src/rom_entry.h:85
+msgid "Incorrect"
+msgstr "Non corretti"
+
+#: ../src/gmameui-rominfo-dlg.c:104
+msgid "Passed"
+msgstr "Passato"
 
-#: ../src/gui.c:649
+#: ../src/gmameui-rominfo-dlg.c:105 ../src/io.c:250 ../src/io.c:253
+#: ../src/rom_entry.c:478 ../src/rom_entry.c:481 ../src/rom_entry.c:559
+#: ../src/rom_entry.c:562 ../src/rom_entry.h:87
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: ../src/gmameui-rominfo-dlg.c:107
+msgid "Best available"
+msgstr "Migliori disponibili"
+
+#: ../src/gmameui-rominfo-dlg.c:108
+msgid "Not available"
+msgstr "Non disponibile"
+
+#: ../src/gmameui-rominfo-dlg.c:268
 #, c-format
-msgid "Error - cannot open zip file %s"
-msgstr "Errore - non riesco ad aprire il file zip %s"
+msgid "%i colors"
+msgstr "%i colori"
 
-#: ../src/gui.c:741
+#: ../src/gmameui-rominfo-dlg.c:296
+msgid "Checking..."
+msgstr "Verificando..."
+
+#: ../src/gmameui-search-entry.c:128
+msgid "Clear the search text"
+msgstr "Pulisci il testo delle ricerca"
+
+#: ../src/gui.c:80
 #, c-format
 msgid "Time to initialise icons: %.02f seconds"
 msgstr "Tempo di inizializzazione delle icone: %.02f secondi"
 
-#: ../src/gui.c:746
+#: ../src/gui.c:87
 #, c-format
 msgid "Time to create main window, filters and gamelist: %.02f seconds"
 msgstr ""
 "Tempo per la creazione della finestra principale, dei filtri e dei giochi: "
 "%.02f secondi"
 
-#: ../src/gui.c:772
+#: ../src/gui.c:114
 #, c-format
 msgid "Time to complete start of UI: %.02f seconds"
 msgstr "Tempo per completare l'avvio della UI: %.02f secondi"
 
-#: ../src/gui.c:793
-#, c-format
-msgid "%s is not a valid executable"
-msgstr "%s non è un eseguibile valido"
+#: ../src/gui.c:137
+msgid "Do you want to rebuild the gamelist?"
+msgstr "Vuoi ricostruire la lista dei giochi?"
+
+#: ../src/gui.c:139
+msgid ""
+"The selected MAME executable has changed, so the list of supported ROMs will "
+"have changed. It is recommended that you rebuild the gamelist. Do you want "
+"to rebuild now?"
+msgstr ""
+"L'eseguibile MAME selezionato è cambiato, è quindi cambiata la lista delle "
+"ROM supportate. È raccomandata la ricostruzione della lista giochi. Vuoi "
+"ricostruirla adesso?"
 
-#: ../src/gui.c:859
+#: ../src/gui.c:141
+msgid "Rebuild gamelist"
+msgstr "Ricostruisci lista giochi"
+
+#: ../src/gui.c:147
+msgid "Executable is not valid MAME executable... skipping"
+msgstr "L'eseguibile MAME selezionato non è un eseguibile valido... salto"
+
+#: ../src/gui.c:234
 msgid "No executables"
 msgstr "Non eseguibili"
 
 #. update statusbar
-#: ../src/gui.c:1358
+#: ../src/gui.c:770
 msgid "No game selected"
 msgstr "Nessun gioco selezionato"
 
-#: ../src/gui.c:1465
+#: ../src/gui.c:800
 msgid "Choose inp file to play"
 msgstr "Scegli un file 'inp' da visualizzare"
 
-#: ../src/gui.c:1494
+#: ../src/gui.c:829
 msgid "File exists"
 msgstr "Il file esiste"
 
-#: ../src/gui.c:1496
+#: ../src/gui.c:831
 #, c-format
 msgid "A file named '%s' already exists. Do you want to overwrite it?"
 msgstr "Un file con nome '%s' esite già. Vuoi sovrascriverlo?"
 
 #. Toplevel
-#: ../src/gui.h:52
+#: ../src/gui.h:54
 msgid "_File"
 msgstr "_File"
 
-#: ../src/gui.h:53
+#: ../src/gui.h:55
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../src/gui.h:54
+#: ../src/gui.h:56
 msgid "_Options"
 msgstr "_Impostazioni"
 
-#: ../src/gui.h:55
+#: ../src/gui.h:57
 msgid "_Help"
 msgstr "_Aiuto"
 
 #. File menu
-#: ../src/gui.h:58
+#: ../src/gui.h:60
 msgid "_Select Random Game"
 msgstr "_Seleziona un gioco a caso"
 
-#: ../src/gui.h:59 ../src/gui.h:86
+#: ../src/gui.h:61 ../src/gui.h:88
 msgid "Play currently selected game"
 msgstr "Avvia il gioco attualmente selezionato"
 
-#: ../src/gui.h:60
+#: ../src/gui.h:62
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../src/gui.h:61
+#: ../src/gui.h:63
 msgid "Quit GMAMEUI"
 msgstr "Esci da GMAMEUI"
 
 #. View menu
-#: ../src/gui.h:64
+#: ../src/gui.h:66
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: ../src/gui.h:65
+#: ../src/gui.h:67
 msgid "Refresh game list"
 msgstr "Aggiorna la lista dei giochi"
 
 #. Option menu
-#: ../src/gui.h:68
+#: ../src/gui.h:70
 msgid "_Directories..."
 msgstr "_Percorsi"
 
-#: ../src/gui.h:69
+#: ../src/gui.h:71
 msgid "Set directory configuration"
 msgstr "Imposta la configurazione della cartella"
 
-#: ../src/gui.h:70
+#: ../src/gui.h:72
 msgid "_GMAMEUI Preferences..."
 msgstr "Preferenze di _GMAMEUI..."
 
-#: ../src/gui.h:71
+#: ../src/gui.h:73
 msgid "Set GMAMEUI preferences"
 msgstr "Preferenze di GMAMEUI"
 
 #. Help menu
-#: ../src/gui.h:74
+#: ../src/gui.h:76
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../src/gui.h:75
+#: ../src/gui.h:77
 msgid "Open the GMAMEUI manual"
 msgstr "Aprio il manuale di GMAMEUI"
 
-#: ../src/gui.h:77
+#: ../src/gui.h:79
 msgid "About this application"
 msgstr "A riguardo di questa applicazione"
 
 #. File menu
-#: ../src/gui.h:85
+#: ../src/gui.h:87
 msgid "Play"
 msgstr "Gioca!"
 
-#: ../src/gui.h:87
+#: ../src/gui.h:89
 msgid "Play and Record Input..."
 msgstr "Gioca e registra la partita..."
 
-#: ../src/gui.h:88
+#: ../src/gui.h:90
 msgid "Record a game for later playback"
 msgstr "Registra un gioco per un replay successivo"
 
-#: ../src/gui.h:89
+#: ../src/gui.h:91
 msgid "Playback Input..."
 msgstr "Guarda una partita registrata"
 
-#: ../src/gui.h:90
+#: ../src/gui.h:92
 msgid "Playback a recorded game"
 msgstr "Replay di un gioco registrato"
 
-#: ../src/gui.h:91
+#: ../src/gui.h:93
 msgid "Options"
 msgstr "Impostazioni di gioco"
 
-#: ../src/gui.h:92
+#: ../src/gui.h:94
 msgid "Change the options of the selected game"
 msgstr "Cambia le opzioni del gioco selezionato"
 
-#: ../src/gui.h:98
+#: ../src/gui.h:100
 msgid "_Audit All Games"
 msgstr "_Analizza tutti i giochi"
 
-#: ../src/gui.h:99
+#: ../src/gui.h:101
 msgid "Audit ROM and sample sets"
 msgstr "Analizza le ROM ed i suoni"
 
-#: ../src/gui.h:100
+#: ../src/gui.h:102
 msgid "_Rebuild Game List"
 msgstr "_Ricostruisci la lista dei giochi"
 
-#: ../src/gui.h:101
+#: ../src/gui.h:103
 msgid "Rebuild the game list from executable information"
 msgstr "Ricostruisce la lista giochi con le informazioni dell'eseguibile"
 
-#: ../src/gui.h:102
+#: ../src/gui.h:104
 msgid "Default _Options..."
 msgstr "_Impostazioni di gioco"
 
-#: ../src/gui.h:103
+#: ../src/gui.h:105
 msgid "Set default game options"
 msgstr "Imposta le opzioni predefinite del gioco"
 
-#: ../src/gui.h:109
+#: ../src/gui.h:111
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ../src/gui.h:110
+#: ../src/gui.h:112
 msgid "Display the properties of the selected game"
 msgstr "Visualizza le proprietà del gioco selezionato"
 
-#: ../src/gui.h:115
+#: ../src/gui.h:117
 msgid "Add to 'Favorites'"
 msgstr "Aggiungi ai 'Preferiti'"
 
-#: ../src/gui.h:116
+#: ../src/gui.h:118
 msgid "Add this game to your 'Favorites' game folder"
 msgstr "Aggiungi questo gioco alla cartella dei tuoi 'Preferiti'"
 
-#: ../src/gui.h:117
+#: ../src/gui.h:119
 msgid "Remove from 'Favorites'"
 msgstr "Rimuovi dai 'Preferiti'"
 
-#: ../src/gui.h:118
+#: ../src/gui.h:120
 msgid "Remove this game from your 'Favorites' game folder"
 msgstr "Rimuovi questo gioco dalla tua cartella dei 'Preferiti'"
 
-#: ../src/gui.h:124
+#: ../src/gui.h:127
 msgid "Expand All"
 msgstr "Espandi tutto"
 
-#: ../src/gui.h:125
+#: ../src/gui.h:128
 msgid "Expand all rows"
 msgstr "Espandi tutte le righe"
 
-#: ../src/gui.h:126
+#: ../src/gui.h:129
 msgid "Collapse All"
 msgstr "Comprimi tutto"
 
-#: ../src/gui.h:127
+#: ../src/gui.h:130
 msgid "Collapse all rows"
 msgstr "Comprimi tutte le righe"
 
-#: ../src/gui.h:132
+#: ../src/gui.h:135
 msgid "_Toolbar"
 msgstr "Barra degli s_trumenti"
 
-#: ../src/gui.h:133
+#: ../src/gui.h:136
 msgid "Show or hide the toolbar"
 msgstr "Mostra o nascondi la barra degli strumenti"
 
-#: ../src/gui.h:135
+#: ../src/gui.h:138
 msgid "_Status Bar"
 msgstr "Barra di _stato"
 
-#: ../src/gui.h:136
+#: ../src/gui.h:139
 msgid "Show or hide the status bar"
 msgstr "Mostra o nascondi la barra di stato"
 
-#: ../src/gui.h:138
+#: ../src/gui.h:141
 msgid "Fold_er List"
 msgstr "Elenco Cartell_e"
 
-#: ../src/gui.h:139
+#: ../src/gui.h:142
 msgid "Show or hide the folder list"
 msgstr "Mostra o nascondi la lista delle cartelle"
 
-#: ../src/gui.h:141
+#: ../src/gui.h:144
 msgid "Scree_nshot Panel"
 msgstr "Pannello Immagi_ni"
 
-#: ../src/gui.h:142
+#: ../src/gui.h:145
 msgid "Show or hide the screenshot panel"
 msgstr "Mostra o nascondi il pannello delle immagini"
 
-#: ../src/gui.h:148
+#: ../src/gui.h:151
 msgid "_List"
 msgstr "_Elenco"
 
-#: ../src/gui.h:149
+#: ../src/gui.h:152
 msgid "Displays items in a list"
 msgstr "Visualizza i giochi in una lista"
 
-#: ../src/gui.h:150
+#: ../src/gui.h:154
 msgid "List _Tree"
 msgstr "Elenco ad _albero"
 
-#: ../src/gui.h:151
+#: ../src/gui.h:155
 msgid "Displays items in a tree list with clones indented"
 msgstr "Visualizza i giochi in una vista ad albero con i cloni indentati"
 
-#: ../src/gui.h:152
+#: ../src/gui.h:157
 msgid "_Details"
 msgstr "_Dettagli"
 
-#: ../src/gui.h:153
+#: ../src/gui.h:158
 msgid "Displays detailed information about each item"
 msgstr "Visualizza informazioni dettagliate per ogni gioco"
 
-#: ../src/gui.h:154
+#: ../src/gui.h:160
 msgid "Detai_ls Tree"
 msgstr "Dettag_li ad albero"
 
-#: ../src/gui.h:155
+#: ../src/gui.h:161
 msgid "Displays detailed information about each item with clones indented"
 msgstr ""
 "Visualizza informazioni dettagliate per ogni gioco con i cloni indentati"
 
-#: ../src/gui.h:160 ../src/gui.h:161
+#: ../src/gui.h:167 ../src/gui.h:168
 msgid "Hide Column"
 msgstr "Nascondi colonna"
 
-#: ../src/gui_prefs.c:951
+#: ../src/gui_prefs.c:1041
 #, c-format
 msgid "Retrieving default boolean value for %s: %i"
 msgstr "Recupero valore boleano predefinito per %s: %i"
 
-#: ../src/gui_prefs.c:980
+#: ../src/gui_prefs.c:1070
 #, c-format
 msgid "Retrieving default integer value for %s: %i"
 msgstr "Recupero valore intero predefinito per %s: %i"
 
-#: ../src/gui_prefs.c:1009
+#: ../src/gui_prefs.c:1099 ../src/mame_options_legacy.c:635
 #, c-format
 msgid "Retrieving default string value for %s: %s"
 msgstr "Recupero valore stringa predefinita per %s: %s"
 
-#: ../src/gui_prefs_dialog.c:258 ../data/gmameui_prefs.glade.h:12
+#: ../src/gui_prefs_dialog.c:243 ../data/gmameui_prefs.glade.h:10
 msgid "GMAMEUI Preferences"
 msgstr "Preferenze di GMAMEUI"
 
-#: ../src/interface.c:359
+#: ../src/interface.c:387
 msgid "GMAMEUI Arcade Machine Emulator"
 msgstr "GMAMEUI (emulatore di macchine arcade)"
 
-#: ../src/interface.c:531
+#. Availability-related filters
+#: ../src/interface.c:599 ../data/main_gui.glade.h:1
 msgid "All ROMs"
 msgstr "Tutti"
 
-#: ../src/interface.c:563
+#: ../src/interface.c:601
 msgid "Unavailable"
 msgstr "Non disponibili"
 
-#: ../src/interface.c:578 ../src/properties.c:368
-msgid "Incorrect"
-msgstr "Non corretti"
+#. Status-related filters
+#: ../src/interface.c:604 ../src/rom_entry.h:86
+msgid "Correct"
+msgstr "Corrette"
+
+#: ../src/interface.c:605 ../src/rom_entry.h:89
+msgid "Best Available"
+msgstr "Migliori Disponibili"
 
-#: ../src/interface.c:596
+#. Architecture-related filters
+#: ../src/interface.c:609
 msgid "Neo-Geo"
 msgstr "Neo-Geo"
 
-#: ../src/interface.c:609
+#: ../src/interface.c:610
 msgid "CPS1"
 msgstr "CPS1"
 
-#: ../src/interface.c:622
+#: ../src/interface.c:611
 msgid "CPS2"
 msgstr "CPS2"
 
-#: ../src/interface.c:635
+#: ../src/interface.c:612
 msgid "CPS3"
 msgstr "CPS3"
 
-#: ../src/interface.c:648
+#: ../src/interface.c:613
 msgid "Sega System 16"
 msgstr "Sega System 16"
 
-#: ../src/interface.c:661
+#: ../src/interface.c:614
 msgid "Sega Model 2"
 msgstr "Sega Model 2"
 
-#: ../src/interface.c:674
+#: ../src/interface.c:615
 msgid "Namco System 22"
 msgstr "Namco System 22"
 
-#: ../src/interface.c:701
-msgid "Favorites"
-msgstr "Preferiti"
-
-#: ../src/interface.c:730
+#: ../src/interface.c:620
 msgid "Colors"
 msgstr "Colori"
 
-#: ../src/interface.c:758
+#: ../src/interface.c:622
 msgid "Graphics"
 msgstr "Grafica"
 
-#: ../src/interface.c:773
+#. Game Details filters
+#: ../src/interface.c:625
 msgid "Originals"
 msgstr "Originali"
 
-#: ../src/interface.c:786
+#: ../src/interface.c:626
 msgid "Clones"
 msgstr "Cloni"
 
-#: ../src/interface.c:813
+#: ../src/interface.c:628
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../src/interface.c:827
+#: ../src/interface.c:629
 msgid "Raster"
 msgstr "Raster"
 
-#: ../src/interface.c:840 ../src/options.c:2613 ../data/options.glade.h:76
-#: ../data/properties.glade.h:154
+#: ../src/interface.c:630 ../data/options.glade.h:148
+#: ../data/options_legacy.glade.h:157 ../data/properties.glade.h:154
 msgid "Vector"
 msgstr "Vettori"
 
-#: ../src/interface.c:880
+#. TODO		{ ORIENTATION, FILTER_ORIENTATION_V, _("Vertical"), TRUE, "vertical", 0, TRUE, NULL, _("Game Details") },
+#. { ORIENTATION, FILTER_ORIENTATION_H, _("Horizontal"), TRUE, "horizontal", 0, TRUE, NULL, _("Game Details") },
+#: ../src/interface.c:633
 msgid "Trackball"
 msgstr "Trackball"
 
-#: ../src/interface.c:894
+#: ../src/interface.c:634
 msgid "Lightgun"
 msgstr "Pistola"
 
-#: ../src/interface.h:69
+#. Custom filters
+#: ../src/interface.c:637
+msgid "Favorites"
+msgstr "Preferiti"
+
+#: ../src/interface.h:72
 msgid "Play Game"
 msgstr "Carica Gioco"
 
-#: ../src/interface.h:70
+#: ../src/interface.h:73
 msgid "Show Folders"
 msgstr "Mostra Cartelle"
 
-#: ../src/interface.h:71
+#: ../src/interface.h:74
 msgid "Show Sidebar"
 msgstr "Mostra la barra laterale"
 
-#: ../src/interface.h:72
+#: ../src/interface.h:75
 msgid "List"
 msgstr "Lista"
 
-#: ../src/interface.h:73
+#: ../src/interface.h:77
 msgid "List Tree"
 msgstr "Lista ad albero"
 
-#: ../src/interface.h:74 ../data/audit_window.glade.h:10
+#: ../src/interface.h:79 ../data/audit_window.glade.h:10
 #: ../data/properties.glade.h:72 ../data/rom_info.glade.h:8
 msgid "Details"
 msgstr "Dettagli"
 
-#: ../src/interface.h:75
+#: ../src/interface.h:81
 msgid "Details Tree"
 msgstr "Dettagli ad albero"
 
-#: ../src/io.c:363
+#: ../src/io.c:389
 msgid "Performing quick check, please wait:"
 msgstr "Sto performando dei controlli veloci, attendere prego:"
 
-#: ../src/keyboard.c:80
+#: ../src/keyboard.c:79
 msgid "French Layout"
 msgstr "Layout Francesce"
 
-#: ../src/keyboard.c:81
+#: ../src/keyboard.c:80
 msgid "German Layout"
 msgstr "Layout Tedesco"
 
-#: ../src/mameio.c:538 ../src/mameio.c:692
+#: ../src/mame-exec.c:1200
+#, c-format
+msgid "Getting list of valid MAME options using parameter %s"
+msgstr "Recupero lista delle opzioni MAME valide usando il parametro %s"
+
+#. Note: Newer versions of MAME do not report the type
+#: ../src/mame-exec.c:1219
+#, c-format
+msgid "Found option: %s %s%s (%s)"
+msgstr "Trovata opzione: %s %s%s (%s)"
+
+#: ../src/mame-exec.c:1224
+#, c-format
+msgid "Description: \"%s\""
+msgstr "Descrizione: \"%s\""
+
+#: ../src/mame-exec.c:1228
+msgid "Possible values: "
+msgstr "Valori Possibili: "
+
+#: ../src/mameio.c:483 ../src/mameio.c:640
 msgid "Creating game list..."
 msgstr "Sto generando la lista dei giochi..."
 
-#: ../src/mameio.c:539
+#: ../src/mameio.c:484
 msgid "Creating game list, please wait"
 msgstr "Sto generando la lista dei giochi, attendere prego"
 
-#: ../src/mameio.c:570 ../src/mameio.c:717
+#: ../src/mameio.c:518 ../src/mameio.c:668
 #, c-format
 msgid "Creating game list (%d games)..."
 msgstr "Sto generando la lista dei giochi (%d giochi)..."
 
-#: ../src/mameio.c:612
-#, c-format
-msgid "Error executing %s"
-msgstr "Errore eseguendo %s"
-
-#: ../src/mameio.c:695
+#: ../src/mameio.c:643
 msgid "receiving data, please wait"
 msgstr "sto ricevendo i dati, attendere prego"
 
-#: ../src/mameio.c:715
+#: ../src/mameio.c:666
 msgid "creating game list, Please wait:"
 msgstr "sto generando la lista dei giochi, attendere prego:"
 
-#: ../src/mameio.c:973
+#: ../src/mameio.c:935
 msgid "xmame not found"
 msgstr "MAME non trovato"
 
-#: ../src/mameio.c:988
-msgid "I don't know how to generate a gamelist for this version of xmame!"
+#: ../src/mameio.c:954
+msgid "I don't know how to generate a gamelist for this version of MAME!"
 msgstr "Non so come generare la lista dei giochi per questa versione di MAME!"
 
 #. Check that the selected version of MAME supports this option
-#: ../src/mame_options.c:168
+#: ../src/mame_options.c:237
 #, c-format
 msgid "Checking that MAME supports the option %s..."
 msgstr "Sto verificando se MAME supporta l'opzione %s..."
 
-#: ../src/mame_options.c:170
+#: ../src/mame_options.c:239
 msgid "...it does"
 msgstr "...eseguito"
 
-#: ../src/mame_options.c:174
+#: ../src/mame_options.c:243
 #, c-format
 msgid "Error retrieving options value for key %s in category %s: %s"
 msgstr "Errore recupero opzioni valori per la chiave %s nella categoria %s: %s"
 
-#: ../src/mame_options.c:204
+#: ../src/mame_options.c:284
 msgid "...it doesn't"
 msgstr "non eseguito"
 
-#: ../src/mame_options_dialog.c:226
-msgid "MAME Options"
-msgstr "Impostazioni"
-
-#: ../src/network_game.c:275
-msgid "Network game options"
-msgstr "Opzioni per gioco in Rete"
-
-#. network mode
-#: ../src/network_game.c:290
-msgid "Network Mode"
-msgstr "Modalità gioco in Rete"
-
-#. client
-#: ../src/network_game.c:301
-msgid "Client"
-msgstr "Client"
-
-#: ../src/network_game.c:314
-msgid "Server"
-msgstr "Server"
-
-#. Server host:port
-#: ../src/network_game.c:326
-msgid "Host[:Port] : "
-msgstr "Host[:Port] : "
-
-#. Number of players
-#: ../src/network_game.c:346
-msgid "Number of players : "
-msgstr "Numero di giocatori"
-
-#. netmap key
-#: ../src/network_game.c:367
-msgid "Use NetMapKey"
-msgstr "Usa NetMapKey"
-
-#. statedebug
-#: ../src/network_game.c:377
-msgid "Statedebug"
-msgstr "Debug dello stato"
-
-#. bind
-#: ../src/network_game.c:387
-msgid "Bind port:"
-msgstr "Associa porta:"
-
-#. parallelsync
-#: ../src/network_game.c:408
-msgid "Perform network input sync in advance"
-msgstr "Esegui l'input sync di rete in anticipo"
-
-#: ../src/options.c:264
-msgid "Europe, 1 Slot (also been seen on a 4 slot)"
-msgstr "Europa, 1 Slot (è stato anche visto in 4 slot)"
-
-#: ../src/options.c:265
-msgid "Europe, 4 Slot"
-msgstr "Europa, 4 Slot"
-
-#: ../src/options.c:266
-msgid "US, 2 Slot"
-msgstr "America, 2 Slot"
-
-#: ../src/options.c:267
-msgid "US, 6 Slot (V5?)"
-msgstr "America, 6 Slot (V5?)"
-
-#: ../src/options.c:268
-msgid "Asia S3 Ver 6"
-msgstr "Asia S3 Ver 6"
-
-#: ../src/options.c:269
-msgid "Japan, Ver 6 VS Bios"
-msgstr "Giappone, Ver 6 VS Bios"
-
-#: ../src/options.c:270
-msgid "Japan, Older"
-msgstr "Giappone, Vecchio"
-
-#: ../src/options.c:271
-msgid "Universe Bios v1.0 (hack)"
-msgstr "Universe Bios v1.0 (hack)"
-
-#: ../src/options.c:272
-msgid "Universe Bios v1.1 (hack)"
-msgstr "Universe Bios v1.1 (hack)"
-
-#: ../src/options.c:273
-msgid "Debug (Development) Bios"
-msgstr "Debug (Sviluppo) Bios"
-
-#: ../src/options.c:274
-msgid "AES Console (Asia?) Bios"
-msgstr "AES Console (Asia?) Bios"
-
-#: ../src/options.c:275
-msgid "Universe Bios v1.2 (hack)"
-msgstr "Universe Bios v1.2 (hack)"
-
-#: ../src/options.c:869
-msgid "Draw every frame"
-msgstr "Disegna ogni fotogramma"
-
-#: ../src/options.c:871
+#: ../src/mame_options.c:1247 ../src/mame_options_legacy_dialog.c:589
 #, c-format
-msgid "Skip %i of 12 frames"
-msgstr "Salta %i di 12 fotogrammi"
+msgid "The option %s is not supported by MAME %s"
+msgstr "L'opzione %s non è supportata dal MAME %s"
 
-#: ../src/options.c:919 ../src/options.c:2435
-msgid "Auto"
-msgstr "Auto"
-
-#: ../src/options.c:920
-msgid "8 bits"
-msgstr "8 bits"
-
-#: ../src/options.c:921
-msgid "15 bits"
-msgstr "15 bits"
-
-#: ../src/options.c:922
-msgid "16 bits"
-msgstr "16 bits"
-
-#: ../src/options.c:923
-msgid "32 bits"
-msgstr "32 bits"
-
-#: ../src/options.c:946
-msgid "None"
-msgstr "Nessuno"
-
-#: ../src/options.c:947
-msgid "Clockwise"
-msgstr "In senso orario"
-
-#: ../src/options.c:948
-msgid "Anti-clockwise"
-msgstr "In senso anti orario"
-
-#: ../src/options.c:1438
-msgid "GGI options"
-msgstr "Opzioni GGI"
-
-#: ../src/options.c:1447 ../src/options.c:1542
-msgid "linear framebuffer (fast)"
-msgstr "framebuffer lineare (veloce)"
-
-#: ../src/options.c:1451
-msgid "Force resolutions"
-msgstr "Forza le risoluzioni"
-
-#: ../src/options.c:1529
-msgid "SVGA options"
-msgstr "Opzioni SVGA"
-
-#: ../src/options.c:1538
-msgid "planar (modeX) modes"
-msgstr "modi planari (modeX)"
-
-#: ../src/options.c:1546
-msgid "Use tweaked VGA modes"
-msgstr "Utilizza i modi VGA ottimizzati"
-
-#: ../src/options.c:1554
-msgid "Center X:"
-msgstr "Centra X:"
-
-#: ../src/options.c:1564
-msgid "Center Y:"
-msgstr "Centra Y:"
-
-#: ../src/options.c:1705 ../data/properties.glade.h:126
-msgid "Rendering"
-msgstr "Resa"
+#: ../src/mame_options_dialog.c:225
+msgid "MAME Options"
+msgstr "Opzioni MAME"
 
-#. workaround to allow correct translation of "" with gettext
-#: ../src/options.c:1842
+#: ../src/mame_options_legacy.c:711
 #, c-format
-msgid "Buffer size %s"
-msgstr "Dimensione Buffer %s"
+msgid "Retrieving default int value for %s: %d"
+msgstr "Recupero valore intero predefinito per %s: %d"
 
-#: ../src/options.c:2017
-msgid "Controllers"
-msgstr "Periferiche"
-
-#: ../src/options.c:2115
-msgid "Default Layout"
-msgstr "Layout Predefinito"
+#: ../src/mame_options_legacy.c:749
+#, c-format
+msgid "Retrieving default double value for %s: %.2f"
+msgstr "Recupero valore double predefinito per %s: %.2f"
 
-#: ../src/options.c:2436
-msgid "Standard"
-msgstr "Standard"
+#: ../src/mame_options_legacy.c:787
+#, c-format
+msgid "Retrieving default boolean value for %s: %d"
+msgstr "Recupero valore boleano predefinito per %s: %d"
 
-#: ../src/options.c:2437
-msgid "High"
-msgstr "Alto"
+#: ../src/mame_options_legacy_dialog.c:837
+msgid "MAME Legacy Options"
+msgstr "Impostazioni MAME Legacy"
 
-#: ../src/progression_window.c:76
+#: ../src/progression_window.c:75
 msgid "Progress Window"
 msgstr "Finestra di Progressione"
 
-#: ../src/progression_window.c:89
+#: ../src/progression_window.c:88
 msgid "Loading Game..."
 msgstr "Sto Caricando il Gioco..."
 
-#: ../src/progression_window.c:101
+#: ../src/progression_window.c:100
 msgid "rom"
 msgstr "ROM"
 
-#: ../src/properties.c:72 ../src/properties.c:74
-msgid "Can't audit game"
-msgstr "Non posso analizzare il gioco"
-
-#: ../src/properties.c:76 ../src/properties.c:317
-msgid "None required"
-msgstr "Non necessario"
-
-#: ../src/properties.c:188
+#: ../src/rom_entry.c:1039
 msgid " (sound)"
 msgstr " (suono)"
 
-#: ../src/properties.c:285
-#, c-format
-msgid "%i colors"
-msgstr "%i colori"
-
-#: ../src/properties.c:314
-msgid "Checking..."
-msgstr "Verificando..."
-
-#: ../src/properties.c:369
-msgid "Passed"
-msgstr "Passato"
+#: ../src/rom_entry.h:88
+msgid "Problems"
+msgstr "Problemi"
 
-#: ../src/properties.c:372
-msgid "Best available"
-msgstr "Migliori disponibili"
-
-#: ../src/properties.c:373
-msgid "Not available"
+#: ../src/rom_entry.h:90
+msgid "Not Available"
 msgstr "Non disponibile"
 
-#: ../src/properties.c:426
-#, c-format
-msgid "Properties for %s"
-msgstr "Proprietà per %s"
-
-#: ../src/properties.c:428
-msgid "Default Properties"
-msgstr "Proprietà Predefinite"
-
-#: ../src/properties.c:443
-msgid "Reset to Defaults"
-msgstr "Resetta ai Predefiniti"
-
-#: ../src/properties.c:468
-msgid "Global game options"
-msgstr "Opzioni globali di gioco"
+#: ../src/rom_entry.h:91
+msgid "Not a valid set"
+msgstr "Non è un set valido"
 
-#: ../src/properties.c:468
-msgid "Default options used by all games"
-msgstr "Opzioni predefinite usate da tutti i giochi"
-
-#: ../src/xmame_executable.c:134
-#, c-format
-msgid "%s is not a valid xmame executable"
-msgstr "%s non è un eseguibile MAME valido"
-
-#: ../src/xmame_executable.c:205
-#, c-format
-msgid "This version of GMAMEUI supports up to %i xmame executables."
-msgstr "Questa versione di GMAMEUI support fino a %i eseguibili MAME"
-
-#: ../src/xmame_executable.c:1356
-#, c-format
-msgid "Getting list of valid MAME options using parameter %s"
-msgstr "Recupero lista delle opzioni MAME valide usando il parametro %s"
-
-#. Note: Newer versions of MAME do not report the type
-#: ../src/xmame_executable.c:1375
-#, c-format
-msgid "Found option: %s %s%s (%s)"
-msgstr "Trovata opzione: %s %s%s (%s)"
-
-#: ../src/xmame_executable.c:1380
-#, c-format
-msgid "Description: \"%s\""
-msgstr "Descrizione: \"%s\""
-
-#: ../src/xmame_executable.c:1384
-msgid "Possible values: "
-msgstr "Valori Possibili: "
+#: ../src/gmameui-zip-utils.c:45
+msgid "Loaded pixbuf"
+msgstr "Pixbuf caricato"
 
 #: ../data/audit_window.glade.h:1
 msgid "0"
@@ -1348,7 +1226,7 @@ msgstr "Non trovati:"
 msgid "Total:"
 msgstr "Totali:"
 
-#: ../data/audit_window.glade.h:15 ../data/gmameui_prefs.glade.h:23
+#: ../data/audit_window.glade.h:15 ../data/gmameui_prefs.glade.h:22
 #: ../data/rom_info.glade.h:15
 msgid "gtk-close"
 msgstr "gtk-close"
@@ -1401,10 +1279,6 @@ msgstr "Immagini dei pannelli di controllo:"
 msgid "Controller directory:"
 msgstr "Cartella dei controlli:"
 
-#: ../data/directories.glade.h:12
-msgid "Directories Selection"
-msgstr "Selezione Percorsi"
-
 #: ../data/directories.glade.h:13
 msgid "Flyers:"
 msgstr "Immagini delle copertine:"
@@ -1473,256 +1347,440 @@ msgstr "gtk-remove"
 msgid "'The' as a prefix"
 msgstr "'The' come prefisso"
 
-#: ../data/gmameui_prefs.glade.h:2 ../data/options.glade.h:5
-msgid "<b>Miscellaneous Options</b>"
-msgstr "<b>Impostazioni Varie</b>"
-
-#: ../data/gmameui_prefs.glade.h:3
+#: ../data/gmameui_prefs.glade.h:2
 msgid "<b>Startup Options</b>"
 msgstr "<b>Impostazioni di Avvio</b>"
 
-#: ../data/gmameui_prefs.glade.h:4
-msgid "<b>Visible Columns</b>"
-msgstr "<b>Colonne Visibili</b>"
+#: ../data/gmameui_prefs.glade.h:3
+msgid "<b>User Interface Options</b>"
+msgstr "<b>Opzioni Interfaccia Utente</b>"
 
-#: ../data/gmameui_prefs.glade.h:5
+#: ../data/gmameui_prefs.glade.h:4
 msgid "Allow game selection with a joystick"
 msgstr "Permetti la selezione dei giochi con il joystick"
 
-#: ../data/gmameui_prefs.glade.h:7
-msgid "Clone Colour"
-msgstr "Colore dei cloni:"
-
-#: ../data/gmameui_prefs.glade.h:11
+#: ../data/gmameui_prefs.glade.h:9
 msgid "Enable version mismatch warning"
 msgstr "Abilita avviso di versione errata"
 
-#: ../data/gmameui_prefs.glade.h:13
+#: ../data/gmameui_prefs.glade.h:11
 msgid "Game Name"
 msgstr "Nome Gioco"
 
-#: ../data/gmameui_prefs.glade.h:14
+#: ../data/gmameui_prefs.glade.h:12
 msgid "Joystick device:"
 msgstr "Dispositivo Joystick:"
 
-#: ../data/gmameui_prefs.glade.h:16
+#: ../data/gmameui_prefs.glade.h:14
 msgid "Playcount"
 msgstr "Giocati"
 
-#: ../data/gmameui_prefs.glade.h:18
+#: ../data/gmameui_prefs.glade.h:15
+msgid "Prefer custom icons over status icons"
+msgstr "Preferisci icone personali rispetto alle icone di stato"
+
+#: ../data/gmameui_prefs.glade.h:17
 msgid "Search for new games"
 msgstr "Ricerca nuovi giochi all'avvio"
 
-#: ../data/gmameui_prefs.glade.h:19
+#: ../data/gmameui_prefs.glade.h:18
 msgid "Use MAME default options"
 msgstr "Usa le impostazioni predefinite di MAME"
 
-#: ../data/gmameui_prefs.glade.h:22
-msgid "clone_label"
-msgstr "Etichetta clone"
+#: ../data/gmameui_prefs.glade.h:20
+msgid "Visible columns"
+msgstr "Colonne Visibili"
 
-#: ../data/gmameui_prefs.glade.h:24 ../data/rom_info.glade.h:16
-msgid "label"
-msgstr "etichetta"
+#: ../data/main_gui.glade.h:2
+msgid "Available ROMs"
+msgstr "ROM Disponibili"
 
-#: ../data/gmameui_prefs.glade.h:25
-msgid "original_label"
-msgstr "Etichetta originale"
+#: ../data/main_gui.glade.h:3
+msgid "Unavailable ROMs"
+msgstr "ROM Non Disponibili"
 
 #: ../data/options.glade.h:1
 msgid "1"
 msgstr "1"
 
-#: ../data/options.glade.h:2 ../data/properties.glade.h:15
+#: ../data/options.glade.h:2
+msgid ""
+"48000\n"
+"44100\n"
+"22050\n"
+"11025"
+msgstr ""
+"48000\n"
+"44100\n"
+"22050\n"
+"11025"
+
+#: ../data/options.glade.h:6 ../data/properties.glade.h:15
 msgid "<b>Artwork</b>"
 msgstr "<b>Opere d'arte</b>"
 
-#: ../data/options.glade.h:3
+#: ../data/options.glade.h:7
 msgid "<b>Debugging</b>"
 msgstr "<b>Debug</b>"
 
-#: ../data/options.glade.h:4
+#: ../data/options.glade.h:8
 msgid "<b>Input</b>"
 msgstr "<b>Ingressi</b>"
 
-#: ../data/options.glade.h:6
+#: ../data/options.glade.h:9 ../data/options_legacy.glade.h:29
+msgid "<b>Miscellaneous Options</b>"
+msgstr "<b>Impostazioni Varie</b>"
+
+#: ../data/options.glade.h:10 ../data/options_legacy.glade.h:30
 msgid "<b>OpenGL</b>"
 msgstr "<b>OpenGL</b>"
 
-#: ../data/options.glade.h:7
+#: ../data/options.glade.h:11
 msgid "<b>Performance</b>"
 msgstr "<b>Prestazioni</b>"
 
-#: ../data/options.glade.h:8 ../data/properties.glade.h:38
+#: ../data/options.glade.h:12 ../data/options_legacy.glade.h:32
+#: ../data/properties.glade.h:38
 msgid "<b>Rotation</b>"
 msgstr "<b>Rotazione</b>"
 
-#: ../data/options.glade.h:9
+#: ../data/options.glade.h:13
 msgid "<b>Screen</b>"
 msgstr "<b>Schermo</b>"
 
-#: ../data/options.glade.h:10
+#: ../data/options.glade.h:14
 msgid "<b>Sound</b>"
 msgstr "<b>Suono</b>"
 
-#: ../data/options.glade.h:11
+#: ../data/options.glade.h:15
+msgid "<b>State and Playback Options</b>"
+msgstr "<b>Optioni di Registrazione e Riproduzione</b>"
+
+#: ../data/options.glade.h:16
 msgid "<b>Vector</b>"
 msgstr "<b>Vettori</b>"
 
-#: ../data/options.glade.h:12
+#: ../data/options.glade.h:17
 msgid "<b>Video</b>"
 msgstr "<b>Video</b>"
 
-#: ../data/options.glade.h:13
+#: ../data/options.glade.h:18
+msgid ""
+"Adjust gameplay speed to keep refresh rate lower than the screen (-"
+"refreshspeed)"
+msgstr ""
+"Aggiusta velocità di gioco in modo da mantere la velocità di rinfresco più "
+"bassa di quella dello schermo (-refreshspeed)"
+
+#: ../data/options.glade.h:19
+msgid "Allow non-integer stretch factors (-unevenstretch)"
+msgstr "Permetti fattori di allungamento non interi (-unevenstretch)"
+
+#: ../data/options.glade.h:20
 msgid "Allow uneven stretching"
 msgstr "Consenti allungamento irregolare"
 
-#: ../data/options.glade.h:14
+#: ../data/options.glade.h:21
 msgid "Antialias"
 msgstr "Margini sfumati"
 
-#: ../data/options.glade.h:15
+#: ../data/options.glade.h:22 ../data/options_legacy.glade.h:37
 msgid "Artwork"
 msgstr "Opere d'arte"
 
-#: ../data/options.glade.h:16
+#: ../data/options.glade.h:23
 msgid "Audio latency"
 msgstr "Ritardo audio"
 
-#: ../data/options.glade.h:17
+#: ../data/options.glade.h:24
 msgid "Automatic Rotation"
 msgstr "Rotazione automatica"
 
-#: ../data/options.glade.h:18
+#: ../data/options.glade.h:25
 msgid "Automatic frameskip"
 msgstr "Salta i fotogrammi in automatico"
 
-#: ../data/options.glade.h:19
+#: ../data/options.glade.h:26
+msgid "Automatically save and load state"
+msgstr "Salva e carica automaticamente lo stato"
+
+#: ../data/options.glade.h:27
+msgid "Automatically save and load the current state (-autosave)"
+msgstr "Salva e carica automaticamente lo stato corrente (-autosave)"
+
+#: ../data/options.glade.h:28
+msgid "Automatically skip frames (-autoframeskip)"
+msgstr "Salta i fotogrammi in automatico (-autoframeskip)"
+
+#: ../data/options.glade.h:29
 msgid "BIOS name"
 msgstr "Nome BIOS"
 
-#: ../data/options.glade.h:20
+#: ../data/options.glade.h:30
 msgid "Beam width:"
 msgstr "Dimensione fascio:"
 
-#: ../data/options.glade.h:21
+#: ../data/options.glade.h:31
 msgid "Brightness"
 msgstr "Luminosità"
 
-#: ../data/options.glade.h:22
+#: ../data/options.glade.h:32
+msgid "Brightness correction (-brightness)"
+msgstr "Correzione luminosità (-brightness)"
+
+#: ../data/options.glade.h:33
+msgid "Brightness when paused (-pause_brightness)"
+msgstr "Luminosità quando in pausa (-pause_brightness)"
+
+#: ../data/options.glade.h:34
+msgid "Centre horizontally (-centerh)"
+msgstr "Centra orizzontalmente (-centerh)"
+
+#: ../data/options.glade.h:35
+msgid "Centre vertically (-centerv)"
+msgstr "Centra verticalmente (-centerv)"
+
+#: ../data/options.glade.h:36
 msgid "Centre:"
 msgstr "Centra:"
 
-#: ../data/options.glade.h:23
+#: ../data/options.glade.h:37
+msgid "Constrain to the proper aspect ratio (-keepaspect)"
+msgstr "Forza il proprio rapporto di aspetto (-keepaspect)"
+
+#: ../data/options.glade.h:38
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: ../data/options.glade.h:24
+#: ../data/options.glade.h:39
+msgid "Contrast correction (-contrast)"
+msgstr "Correzione contrasto (-contrast)"
+
+#: ../data/options.glade.h:40
+msgid "Control speed of gameplay; lower values are slower (-speed)"
+msgstr "Controlla la velocità di gioco; valori bassi sono più lenti (-speed)"
+
+#: ../data/options.glade.h:41
 msgid "Controller directory"
 msgstr "Cartella del controller"
 
-#: ../data/options.glade.h:25
+#: ../data/options.glade.h:42
 msgid "Convert lightgun button 2 to offscreen support"
-msgstr ""
-"Usa il secondo pulsante della pistola per la funzione fuori schermo"
+msgstr "Usa il secondo pulsante della pistola per la funzione fuori schermo"
 
-#: ../data/options.glade.h:26 ../data/properties.glade.h:69
+#: ../data/options.glade.h:43 ../data/options_legacy.glade.h:57
+#: ../data/properties.glade.h:69
 msgid "Crop artwork"
 msgstr "Ritaglia opere d'arte"
 
-#: ../data/options.glade.h:27
-msgid "Debug"
-msgstr "Debug"
+#: ../data/options.glade.h:44
+msgid "Crop artwork to game screen size (-artwork_crop)"
+msgstr ""
+"Ritaglia l'opera d'arte alla dimensione dello schermo del gioco (-"
+"artwork_crop)"
 
-#: ../data/options.glade.h:28
+#: ../data/options.glade.h:45
 msgid "Debug script:"
 msgstr "Debug script:"
 
-#: ../data/options.glade.h:29
+#: ../data/options.glade.h:46
+msgid "Disable OpenGL GL_ARB_texture_rectangle"
+msgstr "Disattiva OpenGL GL_ARB_texture_rectangle"
+
+#: ../data/options.glade.h:47
+msgid "Disable OpenGL GL_ARB_texture_rectangle (-gl_notexturerect)"
+msgstr "Disattiva OpenGL GL_ARB_texture_rectangle (-gl_notexturerect)"
+
+#: ../data/options.glade.h:48
+msgid "Display additional diagnostic information (-verbose)"
+msgstr "Visualizza informazioni diagnostiche aggiuntive (-verbose)"
+
+#: ../data/options.glade.h:49
 msgid "Effect name:"
 msgstr "Applica effetto:"
 
-#: ../data/options.glade.h:30
+#: ../data/options.glade.h:50
+msgid "Enable OpenGL GLSL"
+msgstr "Attiva OpenGL GLSL"
+
+#: ../data/options.glade.h:51
+msgid "Enable OpenGL GLSL filtering if available (-gl_glsl)"
+msgstr "Attiva il filtro OpenGL GLSL se disponibile (-gl_glsl)"
+
+#: ../data/options.glade.h:52
+msgid ""
+"Enable OpenGL GLSL handling of brightness and contrast (-gl_glsl_vid_attr)"
+msgstr ""
+"Attiva la gestione OpenGL GLSL della luminosità e del contrasto (-"
+"gl_glsl_vid_attr)"
+
+#: ../data/options.glade.h:53
+msgid "Enable OpenGL PBO if available (-gl_pbo)"
+msgstr "Attiva OpenGL PBO se disponibile (-gl_pbo)"
+
+#: ../data/options.glade.h:54
+msgid "Enable OpenGL VBO"
+msgstr "Attiva OpenGL VBO"
+
+#: ../data/options.glade.h:55
+msgid "Enable OpenGL VBO if available (-gl_vbo)"
+msgstr "Attiva OpenGL VBO se disponibile (-gl_vbo)"
+
+#: ../data/options.glade.h:56
+msgid "Enable bilinear filtering (-filter)"
+msgstr "Abilita filtro bilineare (-filter)"
+
+#: ../data/options.glade.h:57
 msgid "Enable cheat mode"
 msgstr "Abilita trucchi nei giochi"
 
-#: ../data/options.glade.h:31
+#: ../data/options.glade.h:58
+msgid "Enable cheats in games (-cheat)"
+msgstr "Abilita trucchi nei giochi (-cheat)"
+
+#: ../data/options.glade.h:59
+msgid "Enable debugger"
+msgstr "Abilita debugger"
+
+#: ../data/options.glade.h:60
 msgid "Enable input from multiple connected devices"
 msgstr "Abilita dispositivi connessi contemporaneamente"
 
-#: ../data/options.glade.h:32
+#: ../data/options.glade.h:61
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: ../data/options.glade.h:33
+#: ../data/options.glade.h:62
 msgid "Enable lightgun"
 msgstr "Abilita pistola ad infrarossi"
 
-#: ../data/options.glade.h:34
+#: ../data/options.glade.h:63
 msgid "Enable logging"
 msgstr "Abilita log"
 
-#: ../data/options.glade.h:35
+#: ../data/options.glade.h:64
 msgid "Enable mouse"
 msgstr "Abilita mouse"
 
-#: ../data/options.glade.h:36
+#: ../data/options.glade.h:65
 msgid "Enable multithreading"
 msgstr "Abilita Multi Threading (sfrutta più processori contemporaneamente)"
 
-#: ../data/options.glade.h:37
+#: ../data/options.glade.h:66
 msgid "Enable samples"
 msgstr "Abilita suoni campionati"
 
-#: ../data/options.glade.h:38 ../data/properties.glade.h:86
+#: ../data/options.glade.h:67
+msgid "Enable samples if available (-samples)"
+msgstr "Abilita suoni campionati se disponibili (-samples)"
+
+#: ../data/options.glade.h:68 ../data/options_legacy.glade.h:84
+#: ../data/properties.glade.h:86
 msgid "Enable sound"
 msgstr "Abilita suono"
 
-#: ../data/options.glade.h:39
+#: ../data/options.glade.h:69
+msgid "Enable sound output (-sound)"
+msgstr "Abilita uscita sonora (-sound)"
+
+#: ../data/options.glade.h:70 ../data/options_legacy.glade.h:85
 msgid "Enable steadykey support"
-msgstr "Abilita supporto chiave costante"
+msgstr "Abilita supporto steadykey"
 
-#: ../data/options.glade.h:40
+#: ../data/options.glade.h:71
+msgid "Enable/disable debugger (-debug)"
+msgstr "Abilita/disabilita debugger (-debug)"
+
+#: ../data/options.glade.h:72
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../data/options.glade.h:41
+#: ../data/options.glade.h:73
 msgid "Flicker:"
 msgstr "Sfarfallio:"
 
-#: ../data/options.glade.h:42
+#: ../data/options.glade.h:74
 msgid "Flip"
 msgstr "Inverti"
 
-#: ../data/options.glade.h:43 ../data/properties.glade.h:93
+#: ../data/options.glade.h:75
+msgid "Flip screen left-right (-flipx)"
+msgstr "Inverti schermo sinistra-destra (-flipx)"
+
+#: ../data/options.glade.h:76
+msgid "Flip screen upside-down (-flipy)"
+msgstr "Inverti schermo su-giù (-flipy)"
+
+#: ../data/options.glade.h:77
+msgid "Force power of two textures"
+msgstr "Forza potenza di due texture"
+
+#: ../data/options.glade.h:78
+msgid "Force power of two textures (gl_forcepow2texture)"
+msgstr "Forza potenza di due texture (gl_forcepow2texture)"
+
+#: ../data/options.glade.h:79 ../data/options_legacy.glade.h:103
+#: ../data/properties.glade.h:93
 msgid "Frames to skip:"
 msgstr "Fotogrammi da saltare:"
 
-#: ../data/options.glade.h:44
+#: ../data/options.glade.h:80
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../data/options.glade.h:45
+#: ../data/options.glade.h:81
+msgid "Gamma correction (-gamma)"
+msgstr "Correzione gamma (-gamma)"
+
+#: ../data/options.glade.h:82
+msgid "Generate an error.log file (-log)"
+msgstr "Genera un file error.log (-log)"
+
+#: ../data/options.glade.h:83
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: ../data/options.glade.h:46 ../data/properties.glade.h:109
+#: ../data/options.glade.h:84
+msgid "If this is selected, MAME will run in a window (-window)"
+msgstr "Se questo è selezionato, MAME girerà in una finestra (-window)"
+
+#: ../data/options.glade.h:85 ../data/properties.glade.h:109
 msgid "Keep aspect ratio"
 msgstr "Mantieni le proporzioni"
 
-#: ../data/options.glade.h:47
+#: ../data/options.glade.h:86
+msgid "Keep calling video updates whilst paused (-update_in_pause)"
+msgstr "Continua ad aggiornare lo schermo quando in pausa (-update_in_pause)"
+
+#: ../data/options.glade.h:87
 msgid "Keyboard"
 msgstr "Tastiera"
 
-#: ../data/options.glade.h:48
+#: ../data/options.glade.h:88
 msgid "Left-right"
 msgstr "Sinistra-Destra"
 
-#: ../data/options.glade.h:49
+#: ../data/options.glade.h:89
+msgid "Let OpenGL manage brightness and contrast"
+msgstr "Lascia gestire ad OpenGL la luminosità ed il contrasto"
+
+#: ../data/options.glade.h:90
+msgid "Maximize"
+msgstr "Massimizza"
+
+#: ../data/options.glade.h:91
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../data/options.glade.h:50
+#: ../data/options.glade.h:92
+msgid ""
+"Name of a .png file in the Artwork directory to use for scanlines effect (-"
+"effect)"
+msgstr ""
+"Nome di un file .png nella cartella delle opere d'arte per l'uso degli "
+"effetti di scanlines (-effect)"
+
+#: ../data/options.glade.h:93
 msgid ""
 "No filter\n"
 "Bilinear\n"
@@ -1732,63 +1790,157 @@ msgstr ""
 "Bilineare\n"
 "Sfumatura Gaussiana"
 
-#: ../data/options.glade.h:53
+#: ../data/options.glade.h:96
+msgid "Number of screens to create - MAME only supports 1 (-numscreens)"
+msgstr "Numero degli schermi da creare - MAME ne supporta solo 1 (-numscreens)"
+
+#: ../data/options.glade.h:97
 msgid "Number of screens:"
 msgstr "Numero di schermi:"
 
-#: ../data/options.glade.h:54
+#: ../data/options.glade.h:98
 msgid "Other options"
 msgstr "Altre opzioni"
 
-#: ../data/options.glade.h:55
+#: ../data/options.glade.h:99
+msgid "Output error.log data to debugger"
+msgstr "Indirizza i dati del debugger nell'error.log"
+
+#: ../data/options.glade.h:100
+msgid "Output error.log data to the system debugger (-oslog)"
+msgstr "Indirizza i dati del debugger di sistema nell'error.log (-oslog)"
+
+#: ../data/options.glade.h:101
 msgid "Pause Brightness"
 msgstr "Ferma luminosità"
 
-#: ../data/options.glade.h:56
+#: ../data/options.glade.h:102
+msgid "Perform rendering and blitting on a separate thread (-multithreading)"
+msgstr ""
+"Esegui il rendering ed il blitting in un thread separato (-multithreading)"
+
+#: ../data/options.glade.h:103
 msgid "Prescale"
 msgstr "Prescala"
 
-#: ../data/options.glade.h:57
+#: ../data/options.glade.h:104
+msgid "Record AVI"
+msgstr "Registra AVI"
+
+#: ../data/options.glade.h:105
+msgid "Record MNG"
+msgstr "Registra MNG"
+
+#: ../data/options.glade.h:106
+msgid "Record WAV"
+msgstr "Registra WAV"
+
+#: ../data/options.glade.h:107
+msgid "Records a .avi movie to the Snapshot directory (-recordavi)"
+msgstr "Registra un video .avi nella cartella delle Istantanee (-recordavi)"
+
+#: ../data/options.glade.h:108
+msgid "Records a .mng movie to the Snapshot directory (-recordmng)"
+msgstr "Registra un video .mng nella cartella delle Istantanee (-recordmng)"
+
+#: ../data/options.glade.h:109
+msgid "Records a .wav sound file to the Snapshot directory (-recordwav)"
+msgstr ""
+"Registra un file sonoro .wav nella cartella delle Istantanee (-recordwav)"
+
+#: ../data/options.glade.h:110
+msgid "Reduce tearing effects"
+msgstr "Riduci gli effetti di lacerazione"
+
+#: ../data/options.glade.h:111
 msgid "Refresh speed"
 msgstr "Velocità di aggiornamento"
 
-#: ../data/options.glade.h:58
+#: ../data/options.glade.h:112 ../data/options_legacy.glade.h:135
 msgid "Rotate left"
 msgstr "Ruota a sinistra"
 
-#: ../data/options.glade.h:59
+#: ../data/options.glade.h:113 ../data/options_legacy.glade.h:136
 msgid "Rotate right"
 msgstr "Ruota a destra"
 
-#: ../data/options.glade.h:60
+#: ../data/options.glade.h:114
+msgid "Rotate screen anticlockwise 90 degrees (-rol)"
+msgstr "Ruota lo schermo in senso antiorario di 90 gradi (-rol)"
+
+#: ../data/options.glade.h:115
+msgid "Rotate screen clockwise 90 degrees (-ror)"
+msgstr "Ruota lo schermo in senso orario di 90 gradi (-rol)"
+
+#: ../data/options.glade.h:116
 msgid "Rotation"
 msgstr "Rotazione"
 
-#: ../data/options.glade.h:61
+#: ../data/options.glade.h:117
 msgid "Run in window"
 msgstr "Gioca in una finestra"
 
-#: ../data/options.glade.h:62
+#: ../data/options.glade.h:118
 msgid "Sample rate"
 msgstr "Frequenza di campionamento"
 
-#: ../data/options.glade.h:63
+#: ../data/options.glade.h:119
+msgid "Scale game graphics before rendering (-prescale)"
+msgstr "Scala la grafica prima del rendering (-prescale)"
+
+#: ../data/options.glade.h:120
+msgid "Scale mode (-scalemode)"
+msgstr "Modalità di scala (-scalemode)"
+
+#: ../data/options.glade.h:121
 msgid "Screen"
 msgstr "Schermo"
 
-#: ../data/options.glade.h:64
+#: ../data/options.glade.h:122
+msgid "Script for debugger (-debugscript)"
+msgstr "Script per il debugger (-debugscript)"
+
+#: ../data/options.glade.h:123
+msgid ""
+"Set audio latency (increase to reduce glitches, decrease for responsiveness "
+"(-audio_latency)"
+msgstr ""
+"Imposta la latenza dell'audio (aumenta per ridurre le distorzioni, "
+"diminuisci per aumentare la reattività (-audio_latency)"
+
+#: ../data/options.glade.h:124
+msgid "Set vector beam width (-beam)"
+msgstr "Imposta la larghezza del vettore (-beam)"
+
+#: ../data/options.glade.h:125
+msgid "Set vector flicker effect (-flicker)"
+msgstr "Imposta l'effetto sfarfallio del vettore (-flicker)"
+
+#: ../data/options.glade.h:126
 msgid "Show FPS"
 msgstr "Mostra FPS ('F'otogrammi 'P'er 'S'econdo)"
 
-#: ../data/options.glade.h:65
+#: ../data/options.glade.h:127
+msgid "Show the Frames per Second count (-sdlvideofps)"
+msgstr "Mostra il conteggio dei Fotogrammi per Secondo (-sdlvideofps)"
+
+#: ../data/options.glade.h:128
 msgid "Skip gameinfo"
 msgstr "Salta le informazioni iniziali del gioco"
 
-#: ../data/options.glade.h:66
+#: ../data/options.glade.h:129
+msgid "Skip the ROM information screen on launch (-skip_gameinfo)"
+msgstr "Salta le informazioni sulla ROM all'avvio (-skip_gameinfo)"
+
+#: ../data/options.glade.h:130
 msgid "Sleep"
 msgstr "Ferma"
 
-#: ../data/options.glade.h:67
+#: ../data/options.glade.h:131
+msgid "Sleeping when idle (-sleep)"
+msgstr "Ferma quando a riposo (-sleep)"
+
+#: ../data/options.glade.h:132
 msgid ""
 "Software\n"
 "OpenGL"
@@ -1796,60 +1948,115 @@ msgstr ""
 "Software\n"
 "OpenGL"
 
-#: ../data/options.glade.h:69
+#: ../data/options.glade.h:134
+msgid "Sound volume in decibels (-volume)"
+msgstr "Volume sonoro in decibel (-volume)"
+
+#: ../data/options.glade.h:135
 msgid "Speed:"
 msgstr "Velocità:"
 
-#: ../data/options.glade.h:70 ../data/properties.glade.h:139
+#: ../data/options.glade.h:136
+msgid "Start in maximized window (-maximize)"
+msgstr "Avvia con la finistra massimizzata (-maximize)"
+
+#: ../data/options.glade.h:137 ../data/options_legacy.glade.h:149
+#: ../data/properties.glade.h:139
 msgid "Throttle"
 msgstr "Usa velocità massima possibile"
 
-#: ../data/options.glade.h:71
+#: ../data/options.glade.h:138
+msgid "Throttle game in sync with real time (-throttle)"
+msgstr "Velocità di gioco sincronizzata in tempo reale (-throttle)"
+
+#: ../data/options.glade.h:139
 msgid "Up-down"
 msgstr "Su-Giù"
 
-#: ../data/options.glade.h:72
+#: ../data/options.glade.h:140
 msgid "Update in pause"
 msgstr "Aggiornamento in pausa"
 
-#: ../data/options.glade.h:73
+#: ../data/options.glade.h:141
+msgid "Use antialias when drawing vectors (-antialias)"
+msgstr "Usa margini sfumati mentre si disegnano i vettori (-antialias)"
+
+#: ../data/options.glade.h:142
 msgid "Use backdrops"
 msgstr "Usa sfondi"
 
-#: ../data/options.glade.h:74
+#: ../data/options.glade.h:143
+msgid "Use backdrops if artwork is enabled and available (-use_backdrops)"
+msgstr ""
+"Usa gli sfondi se l'opera d'arte è abilitata e disponibile (-use_backdrops)"
+
+#: ../data/options.glade.h:144
 msgid "Use bezels"
 msgstr "Usa mascherina"
 
-#: ../data/options.glade.h:75
+#: ../data/options.glade.h:145
+msgid "Use bezels if artwork is enabled and available (-use_bezels)"
+msgstr ""
+"Usa le mascherine se l'opera d'arte è abilitata e disponibile (-use_bezels)"
+
+#: ../data/options.glade.h:146
 msgid "Use overlays"
 msgstr "Usa sovrapposizione"
 
-#: ../data/options.glade.h:77
+#: ../data/options.glade.h:147
+msgid "Use overlays if artwork is enabled and available (-use_overlays)"
+msgstr ""
+"Usa le sovrappposizioni se l'opera d'arte è abilitata e disponibile (-"
+"use_overlays)"
+
+#: ../data/options.glade.h:149
 msgid "Verbose logging"
 msgstr "Log dettagliato"
 
-#: ../data/options.glade.h:78
+#: ../data/options.glade.h:150
 msgid "Vertical"
 msgstr "Verticale"
 
-#: ../data/options.glade.h:79
+#: ../data/options.glade.h:151
 msgid "Video"
 msgstr "Video"
 
-#: ../data/options.glade.h:80 ../data/properties.glade.h:155
+#: ../data/options.glade.h:152 ../data/properties.glade.h:155
 msgid "Video mode:"
 msgstr "Modalità video:"
 
-#: ../data/options.glade.h:81
+#: ../data/options.glade.h:153 ../data/options_legacy.glade.h:159
 msgid "Volume"
 msgstr "Volume"
 
-#: ../data/options.glade.h:82
+#: ../data/options.glade.h:154
+msgid "Wait for VBLANK before flipping screens factors (-waitvsync)"
+msgstr ""
+"Attendi la sincronia verticale (VBLANK) prima di rinfrescare lo schermo (-"
+"waitvsync)"
+
+#: ../data/options.glade.h:155
+msgid ""
+"Whether software (soft) or hardware (OpenGL) acceleration is used (-video)"
+msgstr ""
+"Se l'accelerazione software (soft) o hardware (OpenGL) è usata (-video)"
+
+#: ../data/options.glade.h:156
 msgid "YUV mode:"
 msgstr "Modalità YUV:"
 
-#: ../data/options.glade.h:83
+#: ../data/options.glade.h:157 ../data/options_legacy.glade.h:161
+#: ../data/properties.glade.h:163
+msgid "dB"
+msgstr "dB"
+
+#: ../data/options.glade.h:158
+msgid "gl_glsl_filter"
+msgstr "gl_glsl_filter"
+
+#: ../data/options.glade.h:159
 msgid ""
+"none\n"
 "aperture1x2rb\n"
 "aperture1x3rb\n"
 "aperture2x4bg\n"
@@ -1857,6 +2064,7 @@ msgid ""
 "aperture4x6\n"
 "scanlines"
 msgstr ""
+"niente\n"
 "aperture1x2rb\n"
 "aperture1x3rb\n"
 "aperture2x4bg\n"
@@ -1864,53 +2072,23 @@ msgstr ""
 "aperture4x6\n"
 "scanlines"
 
-#: ../data/options.glade.h:89 ../data/properties.glade.h:163
-msgid "dB"
-msgstr "dB"
-
-#: ../data/options.glade.h:90
-msgid "gl_forcepow2texture"
-msgstr "gl_forcepow2texture"
-
-#: ../data/options.glade.h:91
-msgid "gl_glsl"
-msgstr "gl_glsl"
-
-#: ../data/options.glade.h:92
-msgid "gl_glsl_filter"
-msgstr "gl_glsl_filter"
-
-#: ../data/options.glade.h:93
-msgid "gl_glsl_vid_attr"
-msgstr "gl_glsl_vid_attr"
-
-#: ../data/options.glade.h:94
-msgid "gl_notexturerect"
-msgstr "gl_notexturerect"
-
-#: ../data/options.glade.h:95
-msgid "gl_pbo"
-msgstr "gl_pbo"
-
-#: ../data/options.glade.h:96
-msgid "gl_vbo"
-msgstr "gl_vbo"
-
-#: ../data/options.glade.h:97
+#: ../data/options.glade.h:166
 msgid ""
 "none\n"
+"async\n"
 "yv12\n"
 "yuy2\n"
 "yv12x2\n"
 "yuy2x2"
 msgstr ""
-"nessuna\n"
+"niente\n"
+"async\n"
 "yv12\n"
 "yuy2\n"
 "yv12x2\n"
 "yuy2x2"
 
-#: ../data/properties.glade.h:1
+#: ../data/options_legacy.glade.h:1 ../data/properties.glade.h:1
 msgid ""
 "/dev/dsp\n"
 "/dev/dsp0\n"
@@ -1928,10 +2106,480 @@ msgstr ""
 "/dev/audio\n"
 "/dev/null"
 
-#: ../data/properties.glade.h:8
+#: ../data/options_legacy.glade.h:8 ../data/properties.glade.h:8
 msgid "/dev/mixer"
 msgstr "/dev/mixer"
 
+#: ../data/options_legacy.glade.h:9
+msgid ""
+"320x200\n"
+"640x480\n"
+"800x600\n"
+"1024x768\n"
+"1280x1024\n"
+"1600x1200"
+msgstr ""
+"320x200\n"
+"640x480\n"
+"800x600\n"
+"1024x768\n"
+"1280x1024\n"
+"1600x1200"
+
+#: ../data/options_legacy.glade.h:15
+msgid ""
+"8000\n"
+"11025\n"
+"16000\n"
+"22050\n"
+"44100\n"
+"48000"
+msgstr ""
+"8000\n"
+"11025\n"
+"16000\n"
+"22050\n"
+"44100\n"
+"48000"
+
+#: ../data/options_legacy.glade.h:21
+msgid "<b>Artwork options</b>"
+msgstr "<b>Opzioni opere d'arte:</b>"
+
+#: ../data/options_legacy.glade.h:22 ../data/properties.glade.h:21
+msgid "<b>Corrections</b>"
+msgstr "<b>Correzioni</b>"
+
+#: ../data/options_legacy.glade.h:23
+msgid "<b>Digital sound and mixer options</b>"
+msgstr "<b>Opzioni mixer e suono digitale</b>"
+
+#: ../data/options_legacy.glade.h:24 ../data/properties.glade.h:22
+msgid "<b>Display options</b>"
+msgstr "<b>Opzioni di Visualizzazione</b>"
+
+#: ../data/options_legacy.glade.h:25 ../data/properties.glade.h:23
+msgid "<b>Effects</b>"
+msgstr "<b>Effetti</b>"
+
+#: ../data/options_legacy.glade.h:26 ../data/properties.glade.h:25
+msgid "<b>Frame skipping</b>"
+msgstr "<b>Salto fotogramma</b>"
+
+#: ../data/options_legacy.glade.h:27 ../data/properties.glade.h:26
+msgid "<b>General sound options</b>"
+msgstr "<b>Opzioni suono generali</b>"
+
+#: ../data/options_legacy.glade.h:28 ../data/properties.glade.h:27
+msgid "<b>Joystick</b>"
+msgstr "<b>Joystick</b>"
+
+#: ../data/options_legacy.glade.h:31 ../data/properties.glade.h:36
+msgid "<b>Resolution</b>"
+msgstr "<b>Risoluzione</b>"
+
+#: ../data/options_legacy.glade.h:33 ../data/properties.glade.h:43
+msgid "<b>Vector options</b>"
+msgstr "<b>Opzioni vettoriali:</b>"
+
+#: ../data/options_legacy.glade.h:34
+msgid "<b>X11-input</b>"
+msgstr "<b>X11-input</b>"
+
+#: ../data/options_legacy.glade.h:35
+msgid "Always use mouse"
+msgstr "Usa sempre il mouse"
+
+#: ../data/options_legacy.glade.h:36 ../data/properties.glade.h:52
+msgid "Analog joystick"
+msgstr "Joystick analogico"
+
+#: ../data/options_legacy.glade.h:38 ../data/properties.glade.h:54
+msgid "Artwork resolution:"
+msgstr "Rrisoluzione Artwork:"
+
+#: ../data/options_legacy.glade.h:39 ../data/properties.glade.h:55
+msgid "Audio device:"
+msgstr "Dispositivo Audio:"
+
+#: ../data/options_legacy.glade.h:40
+msgid ""
+"Auto\n"
+"8 bits\n"
+"15 bits\n"
+"16 bits\n"
+"32 bits"
+msgstr ""
+"Auto\n"
+"8 bits\n"
+"15 bits\n"
+"16 bits\n"
+"32 bits"
+
+#: ../data/options_legacy.glade.h:45
+msgid ""
+"Auto\n"
+"Standard\n"
+"High"
+msgstr ""
+"Automatico\n"
+"Standard\n"
+"Alto"
+
+#: ../data/options_legacy.glade.h:48 ../data/properties.glade.h:57
+msgid "Autodouble"
+msgstr "Autoraddoppia"
+
+#: ../data/options_legacy.glade.h:49 ../data/properties.glade.h:58
+msgid "Automatic"
+msgstr "Automatico"
+
+#: ../data/options_legacy.glade.h:50 ../data/properties.glade.h:59
+msgid "Backdrops"
+msgstr "Sfondi"
+
+#: ../data/options_legacy.glade.h:51 ../data/properties.glade.h:60
+msgid "Beam size"
+msgstr "Dimensione fascio"
+
+#: ../data/options_legacy.glade.h:52
+msgid "Beam size for vector games"
+msgstr "Larghezza dimensione del vettore per i giochi"
+
+#: ../data/options_legacy.glade.h:53 ../data/properties.glade.h:61
+msgid "Bezels"
+msgstr "Mascherine"
+
+#: ../data/options_legacy.glade.h:54 ../data/properties.glade.h:63
+msgid "Bit per pixels:"
+msgstr "Bit per pixels:"
+
+#: ../data/options_legacy.glade.h:55 ../data/properties.glade.h:64
+msgid "Brightness correction"
+msgstr "Correzione luminosità"
+
+#: ../data/options_legacy.glade.h:56
+msgid "Buffer size"
+msgstr "Dimensione Buffer"
+
+#: ../data/options_legacy.glade.h:58 ../data/properties.glade.h:70
+msgid "DSP Plugin:"
+msgstr "DSP Plugin:"
+
+#: ../data/options_legacy.glade.h:59
+msgid "Display Options"
+msgstr "Opzioni di Visualizzazione"
+
+#: ../data/options_legacy.glade.h:60 ../data/properties.glade.h:76
+msgid "Do not apply rotation"
+msgstr "Non applicare la rotazione"
+
+#: ../data/options_legacy.glade.h:61 ../data/properties.glade.h:79
+msgid "Draw antialiased vectors"
+msgstr "Disegna vettori con antialias"
+
+#: ../data/options_legacy.glade.h:62
+msgid ""
+"Draw every frame\n"
+"Skip 1 out of 12 frames\n"
+"Skip 2 out of 12 frames\n"
+"Skip 3 out of 12 frames\n"
+"Skip 4 out of 12 frames\n"
+"Skip 5 out of 12 frames\n"
+"Skip 6 out of 12 frames\n"
+"Skip 7 out of 12 frames\n"
+"Skip 8 out of 12 frames\n"
+"Skip 9 out of 12 frames\n"
+"Skip 10 out of 12 frames\n"
+"Skip 11 out of 12 frames\n"
+"Skip 12 out of 12 frames"
+msgstr ""
+"Disegna ogni fotogramma\n"
+"Salta 1 di 12 fotogrammi\n"
+"Salta 2 di 12 fotogrammi\n"
+"Salta 3 di 12 fotogrammi\n"
+"Salta 4 di 12 fotogrammi\n"
+"Salta 5 di 12 fotogrammi\n"
+"Salta 6 di 12 fotogrammi\n"
+"Salta 7 di 12 fotogrammi\n"
+"Salta 8 di 12 fotogrammi\n"
+"Salta 9 di 12 fotogrammi\n"
+"Salta 10 di 12 fotogrammi\n"
+"Salta 11 di 12 fotogrammi\n"
+"Salta 12 di 12 fotogrammi"
+
+#: ../data/options_legacy.glade.h:75 ../data/properties.glade.h:81
+msgid "Draw only changes"
+msgstr "Disegna solo i cambiamenti"
+
+#: ../data/options_legacy.glade.h:76 ../data/properties.glade.h:82
+msgid "Draw translucent vectors"
+msgstr "Disegna vettori translucenti"
+
+#: ../data/options_legacy.glade.h:77
+msgid "Effects & Corrections"
+msgstr "Effetti e Correzioni"
+
+#: ../data/options_legacy.glade.h:78
+msgid "Enable antialiasing"
+msgstr "Abilita margini sfumati"
+
+#: ../data/options_legacy.glade.h:79
+msgid "Enable automatic save/restore"
+msgstr "Abilita salvataggio/ripristino automatico"
+
+#: ../data/options_legacy.glade.h:80
+msgid "Enable bilinear filtering"
+msgstr "Abilita filtro bilineare"
+
+#: ../data/options_legacy.glade.h:81
+msgid "Enable double buffering"
+msgstr "Abilita doppio buffering"
+
+#: ../data/options_legacy.glade.h:82 ../data/properties.glade.h:85
+msgid "Enable game cheats"
+msgstr "Abilita trucchi nei giochi"
+
+#: ../data/options_legacy.glade.h:83
+msgid "Enable mapping of Windows keys"
+msgstr "Abilita mappatura dei tasti nelle finestre"
+
+#: ../data/options_legacy.glade.h:86
+msgid "Enable vector antialiasing"
+msgstr "Abilita margini sfumati nei vettori"
+
+#: ../data/options_legacy.glade.h:87
+msgid ""
+"Europe, 1 Slot (also been seen on a 4 slot)\n"
+"Europe, 4 Slot\n"
+"US, 2 Slot\n"
+"US, 6 Slot (V5?)\n"
+"Asia S3 Ver 6\n"
+"Japan, Ver 6 VS Bios\n"
+"Japan, Older\n"
+"Universe Bios v1.0 (hack)\n"
+"Universe Bios v1.1 (hack)\n"
+"Debug (Development) Bios\n"
+"AES Console (Asia?) Bios\n"
+"Universe Bios v1.2 (hack)"
+msgstr ""
+"Europe, 1 Slot (visto anche nei 4 slot)\n"
+"Europe, 4 Slot\n"
+"US, 2 Slot\n"
+"US, 6 Slot (V5?)\n"
+"Asia S3 Ver 6\n"
+"Japan, Ver 6 VS Bios\n"
+"Japan, Older\n"
+"Universe Bios v1.0 (hack)\n"
+"Universe Bios v1.1 (hack)\n"
+"Debug (Development) Bios\n"
+"AES Console (Asia?) Bios\n"
+"Universe Bios v1.2 (hack)"
+
+#: ../data/options_legacy.glade.h:99 ../data/properties.glade.h:87
+msgid "Fake sound"
+msgstr "Suono falso"
+
+#: ../data/options_legacy.glade.h:100 ../data/properties.glade.h:89
+msgid "Flicker"
+msgstr "Sfarfallio"
+
+#: ../data/options_legacy.glade.h:101 ../data/properties.glade.h:90
+msgid "Flip screen left-right"
+msgstr "Inverti schermo sinistra-destra"
+
+#: ../data/options_legacy.glade.h:102 ../data/properties.glade.h:91
+msgid "Flip screen upside-down"
+msgstr "Inverti schermo su-giù"
+
+#: ../data/options_legacy.glade.h:104 ../data/properties.glade.h:95
+msgid "Fullscreen"
+msgstr "Schermo intero"
+
+#: ../data/options_legacy.glade.h:105
+msgid "GL Texture size"
+msgstr "Dimensione Texture GL"
+
+#: ../data/options_legacy.glade.h:106 ../data/properties.glade.h:98
+msgid "Gamma correction"
+msgstr "Correzione gamma"
+
+#: ../data/options_legacy.glade.h:107 ../data/properties.glade.h:103
+msgid "Height scale:"
+msgstr "Scala altezza:"
+
+#: ../data/options_legacy.glade.h:108 ../data/properties.glade.h:106
+msgid "Intensity"
+msgstr "Intensità"
+
+#: ../data/options_legacy.glade.h:109 ../data/properties.glade.h:108
+msgid "Joystick type:"
+msgstr "Tipo Joystick"
+
+#: ../data/options_legacy.glade.h:110 ../data/properties.glade.h:112
+msgid "Log debug info"
+msgstr "Registra le informazioni di debug"
+
+#: ../data/options_legacy.glade.h:111 ../data/properties.glade.h:113
+msgid "Max frameskip:"
+msgstr "Salto massimo fotogramma:"
+
+#: ../data/options_legacy.glade.h:112 ../data/properties.glade.h:116
+msgid "Mixer device:"
+msgstr "Dispositivo mixer:"
+
+#: ../data/options_legacy.glade.h:113 ../data/properties.glade.h:117
+msgid "Mixer plugin:"
+msgstr "Plugin mixer:"
+
+#: ../data/options_legacy.glade.h:114 ../data/properties.glade.h:120
+msgid "Neo-Geo Bios:"
+msgstr "Bios Neo-Geo:"
+
+#: ../data/options_legacy.glade.h:115
+msgid ""
+"No joystick\n"
+"SDL joystick"
+msgstr ""
+"Nessun joystick\n"
+"joystick SDL"
+
+#: ../data/options_legacy.glade.h:117
+msgid ""
+"None\n"
+"Smooth Scaling Effect\n"
+"Low Quality Filter\n"
+"High Quality Filter\n"
+"6-tap Filter with H-Scanlines\n"
+"Light Scanlines\n"
+"RGB Scanlines\n"
+"Deluxe Scanlines\n"
+"Black Scanlines"
+msgstr ""
+"Nessuno\n"
+"Effetti di Scalatura Sfumati\n"
+"Filtro Bassa Qualità\n"
+"Filtro Alta Qualità\n"
+"Filtro 6-tap con H-Scanlines\n"
+"Scanlines Leggere\n"
+"Scanlines RGB\n"
+"Scanlines Deluxe\n"
+"Scanlines Nere"
+
+#: ../data/options_legacy.glade.h:126
+msgid "OSS\n"
+msgstr "OSS\n"
+
+#: ../data/options_legacy.glade.h:128
+msgid ""
+"OSS\n"
+"SDL\n"
+"aRTS"
+msgstr ""
+"OSS\n"
+"SDL\n"
+"aRTS"
+
+#: ../data/options_legacy.glade.h:132 ../data/properties.glade.h:122
+msgid "Overlays"
+msgstr "Overlay"
+
+#: ../data/options_legacy.glade.h:133
+msgid "Pause brightness"
+msgstr "Pausa luminosità"
+
+#: ../data/options_legacy.glade.h:134 ../data/properties.glade.h:125
+msgid "Rapid-fire"
+msgstr "Fuoco rapido"
+
+#: ../data/options_legacy.glade.h:137 ../data/properties.glade.h:130
+msgid "Sample rate:"
+msgstr "Frequenza di campionamento:"
+
+#: ../data/options_legacy.glade.h:138 ../data/properties.glade.h:131
+msgid "Scale video to height:"
+msgstr "Scala video all'altezza:"
+
+#: ../data/options_legacy.glade.h:139
+msgid "Select keyboard grabbing"
+msgstr "Seleziona cattura tastiera"
+
+#: ../data/options_legacy.glade.h:140
+msgid "Select mouse grabbing"
+msgstr "Seleziona cattura mouse"
+
+#: ../data/options_legacy.glade.h:141 ../data/properties.glade.h:132
+msgid "Show cursor"
+msgstr "Mostra cursore"
+
+#: ../data/options_legacy.glade.h:142 ../data/properties.glade.h:133
+msgid "Skip disclaimer info"
+msgstr "Salta le informazioni di responsabilità"
+
+#: ../data/options_legacy.glade.h:143 ../data/properties.glade.h:134
+msgid "Skip game info"
+msgstr "Salta le informazioni del gioco"
+
+#: ../data/options_legacy.glade.h:144 ../data/properties.glade.h:135
+msgid "Sleep when idle"
+msgstr "Ferma quando a riposo"
+
+#: ../data/options_legacy.glade.h:145 ../data/properties.glade.h:137
+msgid "Sound file name:"
+msgstr "Nome file suono:"
+
+#: ../data/options_legacy.glade.h:146
+msgid "Start in cabinet view"
+msgstr "Avvia in visualizzazione mobile"
+
+#: ../data/options_legacy.glade.h:147
+msgid "Stderr logfile"
+msgstr "File di log stderr"
+
+#: ../data/options_legacy.glade.h:148
+msgid "Stdout logfile"
+msgstr "File di log stdout"
+
+#: ../data/options_legacy.glade.h:150 ../data/properties.glade.h:140
+msgid "Timer based audio"
+msgstr "Audio basato su timer:"
+
+#: ../data/options_legacy.glade.h:151 ../data/properties.glade.h:142
+msgid "UGCI (tm) Coin/Play support"
+msgstr "Supporo UGCI (tm) Coin/Play"
+
+#: ../data/options_legacy.glade.h:152 ../data/properties.glade.h:143
+msgid "USB PS Game Pads"
+msgstr "USB PS Game Pads"
+
+#: ../data/options_legacy.glade.h:153 ../data/properties.glade.h:145
+msgid "Use Scanlines"
+msgstr "Usa Scanlines"
+
+#: ../data/options_legacy.glade.h:154 ../data/properties.glade.h:146
+msgid "Use additional game artwork:"
+msgstr "Usa artwork gioco addizionale:"
+
+#: ../data/options_legacy.glade.h:155 ../data/properties.glade.h:150
+msgid "Use keyboard LEDs as game indicators"
+msgstr "Usa i LED della tastiera come indicazioni nel giochi"
+
+#: ../data/options_legacy.glade.h:156 ../data/properties.glade.h:153
+msgid "Use samples"
+msgstr "Usa suoni campionati"
+
+#: ../data/options_legacy.glade.h:158
+msgid "Vector resolution:"
+msgstr "Risoluzione vettore:"
+
+#: ../data/options_legacy.glade.h:160 ../data/properties.glade.h:156
+msgid "Width scale:"
+msgstr "Scala larghezza:"
+
+#: ../data/options_legacy.glade.h:162 ../data/properties.glade.h:164
+msgid "frames"
+msgstr "fotogrammi"
+
 #: ../data/properties.glade.h:9
 msgid "1:"
 msgstr "1:"
@@ -1976,34 +2624,10 @@ msgstr "<b>Colori:</b>"
 msgid "<b>Control Panel</b>"
 msgstr "<b>Pannello di Controllo</b>"
 
-#: ../data/properties.glade.h:21
-msgid "<b>Corrections</b>"
-msgstr "<b>Correzioni</b>"
-
-#: ../data/properties.glade.h:22
-msgid "<b>Display options</b>"
-msgstr "<b>Opzioni di Visualizzazione</b>"
-
-#: ../data/properties.glade.h:23
-msgid "<b>Effects</b>"
-msgstr "<b>Effetti</b>"
-
 #: ../data/properties.glade.h:24
 msgid "<b>FX (Glide) options</b>"
 msgstr "<b>Opzioni FX (Glide)</b>"
 
-#: ../data/properties.glade.h:25
-msgid "<b>Frame skipping</b>"
-msgstr "<b>Salto fotogramma</b>"
-
-#: ../data/properties.glade.h:26
-msgid "<b>General sound options</b>"
-msgstr "<b>Opzioni suono generali</b>"
-
-#: ../data/properties.glade.h:27
-msgid "<b>Joystick</b>"
-msgstr "<b>Joystick</b>"
-
 #: ../data/properties.glade.h:28
 msgid "<b>Key mapping</b>"
 msgstr "<b>Mappa tasti</b>"
@@ -2036,10 +2660,6 @@ msgstr "<b>Opzioni photon</b>"
 msgid "<b>QNX options</b>"
 msgstr "<b>Opzioni QNX</b>"
 
-#: ../data/properties.glade.h:36
-msgid "<b>Resolution</b>"
-msgstr "<b>Risoluzione</b>"
-
 #: ../data/properties.glade.h:37
 msgid "<b>Rom check:</b>"
 msgstr "<b>Verifica ROM:</b>"
@@ -2060,10 +2680,6 @@ msgstr "<b>Schermo:</b>"
 msgid "<b>Sound:</b>"
 msgstr "<b>Sonoro:</b>"
 
-#: ../data/properties.glade.h:43
-msgid "<b>Vector options</b>"
-msgstr "<b>Opzioni vettoriali:</b>"
-
 #: ../data/properties.glade.h:44
 msgid "<b>Video mode</b>"
 msgstr "<b>Modalità video</b>"
@@ -2096,58 +2712,18 @@ msgstr "<b>Opzioni aRts</b>"
 msgid "Alphablending"
 msgstr "Alphablending"
 
-#: ../data/properties.glade.h:52
-msgid "Analog joystick"
-msgstr "Joystick analogico"
-
 #: ../data/properties.glade.h:53
 msgid "Antialiasing"
 msgstr "Margini sfumati"
 
-#: ../data/properties.glade.h:54
-msgid "Artwork resolution:"
-msgstr "Rrisoluzione Artwork:"
-
-#: ../data/properties.glade.h:55
-msgid "Audio device:"
-msgstr "Dispositivo Audio:"
-
 #: ../data/properties.glade.h:56
 msgid "Auto Resolution"
 msgstr "Risoluzione Automatica"
 
-#: ../data/properties.glade.h:57
-msgid "Autodouble"
-msgstr "Autoraddoppia"
-
-#: ../data/properties.glade.h:58
-msgid "Automatic"
-msgstr "Automatico"
-
-#: ../data/properties.glade.h:59
-msgid "Backdrops"
-msgstr "Sfondi"
-
-#: ../data/properties.glade.h:60
-msgid "Beam size"
-msgstr "Dimensione fascio"
-
-#: ../data/properties.glade.h:61
-msgid "Bezels"
-msgstr "Mascherine"
-
 #: ../data/properties.glade.h:62
 msgid "Bilinear filtering"
 msgstr "Filtro bilineare"
 
-#: ../data/properties.glade.h:63
-msgid "Bit per pixels:"
-msgstr "Bit per pixels:"
-
-#: ../data/properties.glade.h:64
-msgid "Brightness correction"
-msgstr "Correzione luminosità"
-
 #: ../data/properties.glade.h:65
 msgid "Cabinet model:"
 msgstr "Modello mobile:"
@@ -2164,10 +2740,6 @@ msgstr "Modulazione colore"
 msgid "Controller:"
 msgstr "Periferica:"
 
-#: ../data/properties.glade.h:70
-msgid "DSP Plugin:"
-msgstr "DSP Plugin:"
-
 #: ../data/properties.glade.h:71
 msgid "Debug windows (for developers)"
 msgstr "Finestra di debug (per sviluppatori)"
@@ -2180,10 +2752,6 @@ msgstr "Dispositivo #:"
 msgid "Disable mode:"
 msgstr "Disattiva modo:"
 
-#: ../data/properties.glade.h:76
-msgid "Do not apply rotation"
-msgstr "Non applicare la rotazione"
-
 #: ../data/properties.glade.h:77
 msgid "Double Buffering"
 msgstr "Double Buffering"
@@ -2192,22 +2760,10 @@ msgstr "Double Buffering"
 msgid "Double buffering"
 msgstr "Double buffering"
 
-#: ../data/properties.glade.h:79
-msgid "Draw antialiased vectors"
-msgstr "Disegna vettori con antialias"
-
 #: ../data/properties.glade.h:80
 msgid "Draw bitmap"
 msgstr "Disegna bitmap"
 
-#: ../data/properties.glade.h:81
-msgid "Draw only changes"
-msgstr "Disegna solo i cambiamenti"
-
-#: ../data/properties.glade.h:82
-msgid "Draw translucent vectors"
-msgstr "Disegna vettori translucenti"
-
 #: ../data/properties.glade.h:83
 msgid "Effect to use:"
 msgstr "Effetto da usare:"
@@ -2216,30 +2772,10 @@ msgstr "Effetto da usare:"
 msgid "Enable Windows keys"
 msgstr "Abilita Tasti Finestre"
 
-#: ../data/properties.glade.h:85
-msgid "Enable game cheats"
-msgstr "Abilita trucchi nei giochi"
-
-#: ../data/properties.glade.h:87
-msgid "Fake sound"
-msgstr "Suono falso"
-
 #: ../data/properties.glade.h:88
 msgid "File:"
 msgstr "File:"
 
-#: ../data/properties.glade.h:89
-msgid "Flicker"
-msgstr "Sfarfallio"
-
-#: ../data/properties.glade.h:90
-msgid "Flip screen left-right"
-msgstr "Inverti schermo sinistra-destra"
-
-#: ../data/properties.glade.h:91
-msgid "Flip screen upside-down"
-msgstr "Inverti schermo su-giù"
-
 #: ../data/properties.glade.h:92
 msgid "Force YUV mode:"
 msgstr "Forza il modo YUV:"
@@ -2248,10 +2784,6 @@ msgstr "Forza il modo YUV:"
 msgid "Full Screen"
 msgstr "Schermo Intero"
 
-#: ../data/properties.glade.h:95
-msgid "Fullscreen"
-msgstr "Schermo intero"
-
 #: ../data/properties.glade.h:96
 msgid "GL extension #78"
 msgstr "Estenzioni GL #78"
@@ -2260,10 +2792,6 @@ msgstr "Estenzioni GL #78"
 msgid "GLU library:"
 msgstr "Libreria GLU:"
 
-#: ../data/properties.glade.h:98
-msgid "Gamma correction"
-msgstr "Correzione gamma"
-
 #: ../data/properties.glade.h:99
 msgid "General"
 msgstr "Generale"
@@ -2280,10 +2808,6 @@ msgstr "Cattura tastiera"
 msgid "Grab mouse"
 msgstr "Cattura mouse"
 
-#: ../data/properties.glade.h:103
-msgid "Height scale:"
-msgstr "Scala altezza:"
-
 #: ../data/properties.glade.h:104
 msgid "HotRod SE support"
 msgstr "Suppoto HotRod SE"
@@ -2292,18 +2816,10 @@ msgstr "Suppoto HotRod SE"
 msgid "HotRod support"
 msgstr "Supporto HotRod"
 
-#: ../data/properties.glade.h:106
-msgid "Intensity"
-msgstr "Intensità"
-
 #: ../data/properties.glade.h:107
 msgid "Joystick device prefix:"
 msgstr "Prefisso del dispositivo Joystick:"
 
-#: ../data/properties.glade.h:108
-msgid "Joystick type:"
-msgstr "Tipo Joystick"
-
 #: ../data/properties.glade.h:110
 msgid "Keep aspect ratio:"
 msgstr "Mantieni proporzioni"
@@ -2312,26 +2828,10 @@ msgstr "Mantieni proporzioni"
 msgid "Keyboard Layout type:"
 msgstr "Tipo layout tastiera"
 
-#: ../data/properties.glade.h:112
-msgid "Log debug info"
-msgstr "Registra le informazioni di debug"
-
-#: ../data/properties.glade.h:113
-msgid "Max frameskip:"
-msgstr "Salto massimo fotogramma:"
-
 #: ../data/properties.glade.h:114
 msgid "Method:"
 msgstr "Metodo:"
 
-#: ../data/properties.glade.h:116
-msgid "Mixer device:"
-msgstr "Dispositivo mixer:"
-
-#: ../data/properties.glade.h:117
-msgid "Mixer plugin:"
-msgstr "Plugin mixer:"
-
 #: ../data/properties.glade.h:118
 msgid ""
 "Name of pad device:\n"
@@ -2340,18 +2840,10 @@ msgstr ""
 "Nome del dispositivo pad:\n"
 "(FM townpad)"
 
-#: ../data/properties.glade.h:120
-msgid "Neo-Geo Bios:"
-msgstr "Bios Neo-Geo:"
-
 #: ../data/properties.glade.h:121
 msgid "OpenGL library:"
 msgstr "Libreria OpenGL"
 
-#: ../data/properties.glade.h:122
-msgid "Overlays"
-msgstr "Overlay"
-
 #: ../data/properties.glade.h:123
 msgid "PCM:"
 msgstr "PCM:"
@@ -2360,9 +2852,9 @@ msgstr "PCM:"
 msgid "Private colormap"
 msgstr "Mappa colori privata"
 
-#: ../data/properties.glade.h:125
-msgid "Rapid-fire"
-msgstr "Fuoco rapido"
+#: ../data/properties.glade.h:126
+msgid "Rendering"
+msgstr "Resa"
 
 #: ../data/properties.glade.h:127
 msgid "Resolution"
@@ -2376,66 +2868,18 @@ msgstr "Risoluzione:"
 msgid "SDL modes:"
 msgstr "Modi SDL:"
 
-#: ../data/properties.glade.h:130
-msgid "Sample rate:"
-msgstr "Frequenza di campionamento:"
-
-#: ../data/properties.glade.h:131
-msgid "Scale video to height:"
-msgstr "Scala video all'altezza:"
-
-#: ../data/properties.glade.h:132
-msgid "Show cursor"
-msgstr "Mostra cursore"
-
-#: ../data/properties.glade.h:133
-msgid "Skip disclaimer info"
-msgstr "Salta le informazioni di responsabilità"
-
-#: ../data/properties.glade.h:134
-msgid "Skip game info"
-msgstr "Salta le informazioni del gioco"
-
-#: ../data/properties.glade.h:135
-msgid "Sleep when idle"
-msgstr "Ferma quando a riposo"
-
-#: ../data/properties.glade.h:137
-msgid "Sound file name:"
-msgstr "Nome file suono:"
-
 #: ../data/properties.glade.h:138
 msgid "Texture size:"
 msgstr "Dimensione della texture:"
 
-#: ../data/properties.glade.h:140
-msgid "Timer based audio"
-msgstr "Audio basato su timer:"
-
 #: ../data/properties.glade.h:141
 msgid "True color blitter"
 msgstr "True color blitter"
 
-#: ../data/properties.glade.h:142
-msgid "UGCI (tm) Coin/Play support"
-msgstr "Supporo UGCI (tm) Coin/Play"
-
-#: ../data/properties.glade.h:143
-msgid "USB PS Game Pads"
-msgstr "USB PS Game Pads"
-
 #: ../data/properties.glade.h:144
 msgid "Use MIT shared memory"
 msgstr "Usa MIT shared memory"
 
-#: ../data/properties.glade.h:145
-msgid "Use Scanlines"
-msgstr "Usa Scanlines"
-
-#: ../data/properties.glade.h:146
-msgid "Use additional game artwork:"
-msgstr "Usa artwork gioco addizionale:"
-
 #: ../data/properties.glade.h:147
 msgid "Use additional options:"
 msgstr "Usa opzioni aggiuntive"
@@ -2448,10 +2892,6 @@ msgstr "Usa nome di configurazione:"
 msgid "Use fixed resolution:"
 msgstr "Usa risoluzione fissa"
 
-#: ../data/properties.glade.h:150
-msgid "Use keyboard LEDs as game indicators"
-msgstr "Usa i LED della tastiera come indicazioni nel giochi"
-
 #: ../data/properties.glade.h:151
 msgid "Use mouse"
 msgstr "Usa il mouse"
@@ -2460,14 +2900,6 @@ msgstr "Usa il mouse"
 msgid "Use preferred device"
 msgstr "Usa dispositivo preferito"
 
-#: ../data/properties.glade.h:153
-msgid "Use samples"
-msgstr "Usa suoni campionati"
-
-#: ../data/properties.glade.h:156
-msgid "Width scale:"
-msgstr "Scala larghezza:"
-
 #: ../data/properties.glade.h:157
 msgid "Window size:"
 msgstr "Dimensione finestra:"
@@ -2492,10 +2924,6 @@ msgstr "XIL scaling"
 msgid "aRts buffer delay time:"
 msgstr "Ritardo buffer aRts:"
 
-#: ../data/properties.glade.h:164
-msgid "frames"
-msgstr "fotogrammi"
-
 #: ../data/rom_info.glade.h:1
 msgid "<b>About this ROM</b>"
 msgstr "<b>A riguardo di questo gioco</b>"
@@ -2548,6 +2976,10 @@ msgstr "Suono:"
 msgid "Year:"
 msgstr "Anno:"
 
+#: ../data/rom_info.glade.h:16
+msgid "label"
+msgstr "etichetta"
+
 #: ../data/sidebar.glade.h:1
 msgid "Cabinet"
 msgstr "Mobile"
@@ -2584,6 +3016,207 @@ msgstr "GMAMEUI (M.A.M.E. Frontend)"
 msgid "Play and browse classic arcade games"
 msgstr "Gioca ai classici giochi arcade"
 
+#~ msgid "No valid xmame executables found"
+#~ msgstr "Nessun eseguibile MAME trovato"
+
+#~ msgid "Current exec set to %s"
+#~ msgstr "Eseguibile corrente impostato a %s"
+
+#~ msgid "default options not loaded, using default values"
+#~ msgstr "opzioni di default non caricate, userò i valori predefiniti"
+
+#~ msgid "Found file name %s with CRC: %u, size %i"
+#~ msgstr "Trovato nome file: %s, CRC %u, dimensione %i"
+
+#~ msgid "Attempting to uncompress %s"
+#~ msgstr "Sto scompattando %s"
+
+#~ msgid "Error while uncompressing %s: %s"
+#~ msgstr "Errore durante la compattazione %s: %s"
+
+#~ msgid "Error - cannot open zip file %s"
+#~ msgstr "Errore - non riesco ad aprire il file zip %s"
+
+#~ msgid "Error executing %s"
+#~ msgstr "Errore eseguendo %s"
+
+#~ msgid "Network game options"
+#~ msgstr "Opzioni per gioco in Rete"
+
+#~ msgid "Network Mode"
+#~ msgstr "Modalità gioco in Rete"
+
+#~ msgid "Client"
+#~ msgstr "Client"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Host[:Port] : "
+#~ msgstr "Host[:Port] : "
+
+#~ msgid "Number of players : "
+#~ msgstr "Numero di giocatori"
+
+#~ msgid "Use NetMapKey"
+#~ msgstr "Usa NetMapKey"
+
+#~ msgid "Statedebug"
+#~ msgstr "Debug dello stato"
+
+#~ msgid "Bind port:"
+#~ msgstr "Associa porta:"
+
+#~ msgid "Perform network input sync in advance"
+#~ msgstr "Esegui l'input sync di rete in anticipo"
+
+#~ msgid "Europe, 1 Slot (also been seen on a 4 slot)"
+#~ msgstr "Europa, 1 Slot (è stato anche visto in 4 slot)"
+
+#~ msgid "Europe, 4 Slot"
+#~ msgstr "Europa, 4 Slot"
+
+#~ msgid "US, 2 Slot"
+#~ msgstr "America, 2 Slot"
+
+#~ msgid "US, 6 Slot (V5?)"
+#~ msgstr "America, 6 Slot (V5?)"
+
+#~ msgid "Asia S3 Ver 6"
+#~ msgstr "Asia S3 Ver 6"
+
+#~ msgid "Japan, Ver 6 VS Bios"
+#~ msgstr "Giappone, Ver 6 VS Bios"
+
+#~ msgid "Japan, Older"
+#~ msgstr "Giappone, Vecchio"
+
+#~ msgid "Universe Bios v1.0 (hack)"
+#~ msgstr "Universe Bios v1.0 (hack)"
+
+#~ msgid "Universe Bios v1.1 (hack)"
+#~ msgstr "Universe Bios v1.1 (hack)"
+
+#~ msgid "Debug (Development) Bios"
+#~ msgstr "Debug (Sviluppo) Bios"
+
+#~ msgid "AES Console (Asia?) Bios"
+#~ msgstr "AES Console (Asia?) Bios"
+
+#~ msgid "Universe Bios v1.2 (hack)"
+#~ msgstr "Universe Bios v1.2 (hack)"
+
+#~ msgid "Draw every frame"
+#~ msgstr "Disegna ogni fotogramma"
+
+#~ msgid "Skip %i of 12 frames"
+#~ msgstr "Salta %i di 12 fotogrammi"
+
+#~ msgid "Auto"
+#~ msgstr "Auto"
+
+#~ msgid "8 bits"
+#~ msgstr "8 bits"
+
+#~ msgid "15 bits"
+#~ msgstr "15 bits"
+
+#~ msgid "16 bits"
+#~ msgstr "16 bits"
+
+#~ msgid "32 bits"
+#~ msgstr "32 bits"
+
+#~ msgid "None"
+#~ msgstr "Nessuno"
+
+#~ msgid "Clockwise"
+#~ msgstr "In senso orario"
+
+#~ msgid "Anti-clockwise"
+#~ msgstr "In senso anti orario"
+
+#~ msgid "GGI options"
+#~ msgstr "Opzioni GGI"
+
+#~ msgid "linear framebuffer (fast)"
+#~ msgstr "framebuffer lineare (veloce)"
+
+#~ msgid "Force resolutions"
+#~ msgstr "Forza le risoluzioni"
+
+#~ msgid "SVGA options"
+#~ msgstr "Opzioni SVGA"
+
+#~ msgid "planar (modeX) modes"
+#~ msgstr "modi planari (modeX)"
+
+#~ msgid "Use tweaked VGA modes"
+#~ msgstr "Utilizza i modi VGA ottimizzati"
+
+#~ msgid "Center X:"
+#~ msgstr "Centra X:"
+
+#~ msgid "Center Y:"
+#~ msgstr "Centra Y:"
+
+#~ msgid "Controllers"
+#~ msgstr "Periferiche"
+
+#~ msgid "Default Layout"
+#~ msgstr "Layout Predefinito"
+
+#~ msgid "High"
+#~ msgstr "Alto"
+
+#~ msgid "Properties for %s"
+#~ msgstr "Proprietà per %s"
+
+#~ msgid "Default Properties"
+#~ msgstr "Proprietà Predefinite"
+
+#~ msgid "Reset to Defaults"
+#~ msgstr "Resetta ai Predefiniti"
+
+#~ msgid "Global game options"
+#~ msgstr "Opzioni globali di gioco"
+
+#~ msgid "Default options used by all games"
+#~ msgstr "Opzioni predefinite usate da tutti i giochi"
+
+#~ msgid "%s is not a valid xmame executable"
+#~ msgstr "%s non è un eseguibile MAME valido"
+
+#~ msgid "This version of GMAMEUI supports up to %i xmame executables."
+#~ msgstr "Questa versione di GMAMEUI support fino a %i eseguibili MAME"
+
+#~ msgid "Clone Colour"
+#~ msgstr "Colore dei cloni:"
+
+#~ msgid "clone_label"
+#~ msgstr "Etichetta clone"
+
+#~ msgid "original_label"
+#~ msgstr "Etichetta originale"
+
+#~ msgid "Debug"
+#~ msgstr "Debug"
+
+#~ msgid "gl_glsl"
+#~ msgstr "gl_glsl"
+
+#~ msgid "gl_glsl_vid_attr"
+#~ msgstr "gl_glsl_vid_attr"
+
+#~ msgid "gl_notexturerect"
+#~ msgstr "gl_notexturerect"
+
+#~ msgid "gl_pbo"
+#~ msgstr "gl_pbo"
+
+#~ msgid "gl_vbo"
+#~ msgstr "gl_vbo"
+
 #~ msgid "Not found"
 #~ msgstr "Non trovato"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1a7c081..e97ab66 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: GMAMEUI 0.2.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-17 21:59+1000\n"
-"PO-Revision-Date: 2008-05-28 13:56-0300\n"
-"Last-Translator: Alfredo Jr. <junix at linuxinabox.org>\n"
+"PO-Revision-Date: 2009-07-02 00:26-0300\n"
+"Last-Translator: Alfredo Saldanha <junix at linuxinabox.org>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,17 +17,20 @@ msgstr ""
 
 #: ../src/about.c:51
 msgid "translator-credits"
-msgstr "créditos de tradutores"
+msgstr "créditos dos tradutores"
 
-#: ../src/about.c:59 ../src/about.c:236
+#: ../src/about.c:59
+#: ../src/about.c:236
 msgid "Copyright (c) 2007-2008 Andrew Burton"
 msgstr "Copyright (c) 2007-2008 Andrew Burton"
 
-#: ../src/about.c:61 ../src/about.c:232
+#: ../src/about.c:61
+#: ../src/about.c:232
 msgid "A program to play MAME under Linux"
 msgstr "Um programa para jogar MAME no Linux"
 
-#: ../src/about.c:106 ../src/about.c:206
+#: ../src/about.c:106
+#: ../src/about.c:206
 msgid "Credits"
 msgstr "Créditos"
 
@@ -63,6 +66,9 @@ msgid ""
 "Brazilian Portugese (pt_BR) - Alfredo Jr <junix at linuxinabox.org>\n"
 "Italian (it) - Ugo Viti <ugo.viti at initzero.it>\n"
 msgstr ""
+"As seguintes pessoas traduziram o GMAMEUI:\n"
+"Português do Brasil (pt_BR) - Alfredo Jr <junix at linuxinabox.org>\n"
+"Italiano (it) - Ugo Viti <ugo.viti at initzero.it>\n"
 
 #: ../src/about.c:202
 msgid "About GMAMEUI"
@@ -76,35 +82,41 @@ msgstr "GMAMEUI"
 msgid "Don't know how to verify roms with this version of xmame."
 msgstr "Não foi possível verificar as roms com esta versão do xmame."
 
-#: ../src/callbacks.c:140 ../src/options.c:778 ../data/properties.glade.h:75
+#: ../src/callbacks.c:140
+#: ../src/options.c:778
+#: ../data/properties.glade.h:75
 msgid "Display"
 msgstr "Exibir"
 
 #: ../src/callbacks.c:142
 msgid "OpenGL"
-msgstr ""
+msgstr "OpenGL"
 
-#: ../src/callbacks.c:144 ../src/interface.c:744 ../src/options.c:1755
+#: ../src/callbacks.c:144
+#: ../src/interface.c:744
+#: ../src/options.c:1755
 #: ../data/properties.glade.h:136
 msgid "Sound"
 msgstr "Som"
 
 #: ../src/callbacks.c:146
 msgid "Input"
-msgstr ""
+msgstr "Input"
 
 #: ../src/callbacks.c:148
 msgid "Performance"
-msgstr ""
+msgstr "Performance"
 
-#: ../src/callbacks.c:150 ../src/options.c:2418 ../data/properties.glade.h:115
+#: ../src/callbacks.c:150
+#: ../src/options.c:2418
+#: ../data/properties.glade.h:115
 msgid "Miscellaneous"
 msgstr "Diversos"
 
 #. FIXME: Make the debugging page last
-#: ../src/callbacks.c:152 ../src/mame_options_dialog.c:130
+#: ../src/callbacks.c:152
+#: ../src/mame_options_dialog.c:130
 #: ../src/mame_options_dialog.c:133
-#, fuzzy
 msgid "Debugging"
 msgstr "Debugando"
 
@@ -114,17 +126,15 @@ msgstr "Nenhum executável do xmame foi definido"
 
 #: ../src/callbacks.c:344
 msgid "GMAMEUI Help could not be started"
-msgstr ""
+msgstr "Ajuda do GMAMEUI não pode ser iniciada"
 
 #: ../src/callbacks.c:346
-msgid ""
-"The Help file could not be opened. This will happen if the version of GTK is "
-"not at least 2.13 and libgnome support has not been compiled in."
-msgstr ""
+msgid "The Help file could not be opened. This will happen if the version of GTK is not at least 2.13 and libgnome support has not been compiled in."
+msgstr "O arquivo de Ajuda não pode ser aberto. Isso acontecerá se a versão do GTK não é, no mínimo, 2.13 e o suporte à libgnome não tenha sido compilado."
 
 #: ../src/callbacks.c:357
 msgid "There was an error opening the Help file"
-msgstr ""
+msgstr "Houve um erro ao abrir o arquivo de Ajuda"
 
 #: ../src/directories.c:125
 msgid "Browse for Folder"
@@ -139,55 +149,78 @@ msgid "No valid xmame executables found"
 msgstr "Nenhum executável válido do xmame foi encontrado"
 
 #. Now add the categories
-#: ../src/filters_list.c:202 ../src/interface.c:540 ../src/interface.c:545
-#: ../src/interface.c:555 ../src/interface.c:573 ../src/interface.c:588
-#, fuzzy
+#: ../src/filters_list.c:202
+#: ../src/interface.c:540
+#: ../src/interface.c:545
+#: ../src/interface.c:555
+#: ../src/interface.c:573
+#: ../src/interface.c:588
 msgid "Available"
-msgstr "Não disponível"
-
-#: ../src/filters_list.c:203 ../src/interface.c:604 ../src/interface.c:617
-#: ../src/interface.c:630 ../src/interface.c:643 ../src/interface.c:656
-#: ../src/interface.c:669 ../src/interface.c:682 ../src/interface.c:695
+msgstr "Disponível"
+
+#: ../src/filters_list.c:203
+#: ../src/interface.c:604
+#: ../src/interface.c:617
+#: ../src/interface.c:630
+#: ../src/interface.c:643
+#: ../src/interface.c:656
+#: ../src/interface.c:669
+#: ../src/interface.c:682
+#: ../src/interface.c:695
 msgid "Architecture"
-msgstr ""
+msgstr "Arquitetura"
 
-#: ../src/filters_list.c:204 ../src/interface.c:739 ../src/interface.c:753
+#: ../src/filters_list.c:204
+#: ../src/interface.c:739
+#: ../src/interface.c:753
 #: ../src/interface.c:767
 msgid "Imperfect"
-msgstr ""
-
-#: ../src/filters_list.c:205 ../src/interface.c:781 ../src/interface.c:794
-#: ../src/interface.c:808 ../src/interface.c:822 ../src/interface.c:835
-#: ../src/interface.c:848 ../src/interface.c:889 ../src/interface.c:903
-#, fuzzy
+msgstr "Imperfeito"
+
+#: ../src/filters_list.c:205
+#: ../src/interface.c:781
+#: ../src/interface.c:794
+#: ../src/interface.c:808
+#: ../src/interface.c:822
+#: ../src/interface.c:835
+#: ../src/interface.c:848
+#: ../src/interface.c:889
+#: ../src/interface.c:903
 msgid "Game Details"
-msgstr "Detalhes"
+msgstr "Detalhes do Jogo"
 
-#: ../src/filters_list.c:206 ../src/interface.c:710 ../src/interface.c:723
-#, fuzzy
+#: ../src/filters_list.c:206
+#: ../src/interface.c:710
+#: ../src/interface.c:723
 msgid "Custom"
-msgstr "Auto"
+msgstr "Customizado"
 
-#: ../src/filters_list.c:207 ../src/gmameui-gamelist-view.c:81
-#: ../src/interface.c:928 ../src/mame_options_dialog.c:81
+#: ../src/filters_list.c:207
+#: ../src/gmameui-gamelist-view.c:81
+#: ../src/interface.c:928
+#: ../src/mame_options_dialog.c:81
 #: ../data/gmameui_prefs.glade.h:6
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/filters_list.c:208 ../src/gmameui-gamelist-view.c:79
-#: ../src/interface.c:949 ../data/gmameui_prefs.glade.h:20
+#: ../src/filters_list.c:208
+#: ../src/gmameui-gamelist-view.c:79
+#: ../src/interface.c:949
+#: ../data/gmameui_prefs.glade.h:20
 msgid "Version"
 msgstr "Versão"
 
-#: ../src/game_list.c:312 ../src/io.c:221 ../src/io.c:224
+#: ../src/game_list.c:312
+#: ../src/io.c:221
+#: ../src/io.c:224
 #: ../src/properties.c:370
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #: ../src/game_list.c:358
-#, fuzzy, c-format
+#, c-format
 msgid "Loading gamelist %s"
-msgstr "Carregando lista de jogos"
+msgstr "Carregando lista de jogos %s"
 
 #: ../src/game_list.c:389
 msgid "Game list is corrupted."
@@ -258,21 +291,21 @@ msgstr "Nenhum executável do xmame foi encontrado"
 
 #: ../src/gmameui.c:148
 msgid "Initialising list of possible MAME executable options"
-msgstr ""
+msgstr "Inicializando lista de possíveis opções de executáveis do MAME"
 
 #: ../src/gmameui.c:151
 msgid "Initialising MAME executables"
-msgstr ""
+msgstr "Inicializando executáveis do MAME"
 
 #: ../src/gmameui.c:169
 #, c-format
 msgid "Adding executable from preferences file: %s"
-msgstr ""
+msgstr "Adicionando executável do arquivo de preferências: %s"
 
 #: ../src/gmameui.c:177
 #, c-format
 msgid "Current exec set to %s"
-msgstr ""
+msgstr "Atual definição de execução para %s"
 
 #: ../src/gmameui.c:183
 #, c-format
@@ -319,7 +352,8 @@ msgstr "Joystick %s encontrado"
 msgid "No Joystick found"
 msgstr "Nenhum Joystick foi encontrado"
 
-#: ../src/gmameui.c:401 ../src/gmameui.c:409
+#: ../src/gmameui.c:401
+#: ../src/gmameui.c:409
 #, c-format
 msgid "Loading %s:"
 msgstr "Carregando %s:"
@@ -327,23 +361,23 @@ msgstr "Carregando %s:"
 #: ../src/gmameui.c:499
 #, c-format
 msgid "Error with MAME graphics creation: %s"
-msgstr ""
+msgstr "Erro com criação de gráficos do MAME: %s"
 
 #: ../src/gmameui.c:522
 msgid "GMAMEUI could not load the ROM"
-msgstr ""
+msgstr "GMAMEUI não pode carregar a ROM"
 
 #: ../src/gmameui.c:523
 msgid "The following ROMs were not found:\n"
-msgstr ""
+msgstr "A seguinte ROMs não foi encontrada:\n"
 
 #: ../src/gmameui.c:525
 msgid "MAME did not start successfully"
-msgstr ""
+msgstr "MAME não inicializou com sucesso"
 
 #: ../src/gmameui.c:526
 msgid "The following errors were reported:\n"
-msgstr ""
+msgstr "Os seguintes erros foram reportados:\n"
 
 #: ../src/gmameui.c:709
 #, c-format
@@ -359,83 +393,91 @@ msgstr "Encerrando GMAMEUI..."
 msgid "Finished cleaning up GMAMEUI"
 msgstr "Terminada limpeza do GMAMEUI"
 
-#: ../src/gmameui-audit-dlg.c:221 ../data/audit_window.glade.h:5
+#: ../src/gmameui-audit-dlg.c:221
+#: ../data/audit_window.glade.h:5
 msgid "Auditing MAME ROMs"
-msgstr ""
+msgstr "Auditando ROMs do MAME"
 
-#: ../src/gmameui-audit-dlg.c:273 ../data/audit_window.glade.h:6
+#: ../src/gmameui-audit-dlg.c:273
+#: ../data/audit_window.glade.h:6
 msgid "Auditing ROMs"
-msgstr ""
+msgstr "Auditando ROMs"
 
 #: ../src/gmameui-audit-dlg.c:315
 msgid "Audit Stopped"
 msgstr "Auditoria Parada"
 
 #: ../src/gmameui-audit-dlg.c:316
-#, fuzzy
 msgid "Stopped"
-msgstr "Auditoria Parada"
+msgstr "Parado"
 
 #: ../src/gmameui-audit-dlg.c:440
 #, c-format
 msgid "Auditing romset %s"
-msgstr ""
+msgstr "Auditando romset %s"
 
 #: ../src/gmameui-audit-dlg.c:454
-#, fuzzy, c-format
+#, c-format
 msgid "Auditing sampleset %s"
-msgstr "Carregando lista de jogos"
+msgstr "Auditando sampleset %s"
 
-#: ../src/gmameui-audit-dlg.c:508 ../src/gmameui-audit-dlg.c:511
-#, fuzzy
+#: ../src/gmameui-audit-dlg.c:508
+#: ../src/gmameui-audit-dlg.c:511
 msgid "Audit done"
-msgstr "Auditoria Parada"
+msgstr "Auditoria Feita"
 
 #: ../src/gmameui-audit-dlg.c:509
 msgid "Done"
 msgstr "Feito"
 
 #: ../src/gmameui-gamelist-view.c:45
-#, fuzzy
 msgid "Game"
-msgstr "jogo"
+msgstr "Jogo"
 
-#: ../src/gmameui-gamelist-view.c:47 ../data/directories.glade.h:23
+#: ../src/gmameui-gamelist-view.c:47
+#: ../data/directories.glade.h:23
 msgid "ROMs"
 msgstr "ROMs"
 
-#: ../src/gmameui-gamelist-view.c:49 ../src/interface.c:799
-#: ../data/directories.glade.h:24 ../data/gmameui_prefs.glade.h:17
+#: ../src/gmameui-gamelist-view.c:49
+#: ../src/interface.c:799
+#: ../data/directories.glade.h:24
+#: ../data/gmameui_prefs.glade.h:17
 msgid "Samples"
 msgstr "Amostras"
 
-#: ../src/gmameui-gamelist-view.c:51 ../data/gmameui_prefs.glade.h:9
+#: ../src/gmameui-gamelist-view.c:51
+#: ../data/gmameui_prefs.glade.h:9
 msgid "Directory"
 msgstr "Diretório"
 
-#: ../src/gmameui-gamelist-view.c:53 ../src/interface.c:715
+#: ../src/gmameui-gamelist-view.c:53
+#: ../src/interface.c:715
 msgid "Played"
 msgstr "Jogados"
 
-#: ../src/gmameui-gamelist-view.c:55 ../data/gmameui_prefs.glade.h:15
+#: ../src/gmameui-gamelist-view.c:55
+#: ../data/gmameui_prefs.glade.h:15
 msgid "Manufacturer"
 msgstr "Fabricante"
 
-#: ../src/gmameui-gamelist-view.c:57 ../data/gmameui_prefs.glade.h:21
+#: ../src/gmameui-gamelist-view.c:57
+#: ../data/gmameui_prefs.glade.h:21
 msgid "Year"
 msgstr "Ano"
 
-#: ../src/gmameui-gamelist-view.c:59 ../data/gmameui_prefs.glade.h:8
+#: ../src/gmameui-gamelist-view.c:59
+#: ../data/gmameui_prefs.glade.h:8
 msgid "Clone of"
 msgstr "Clone de"
 
-#: ../src/gmameui-gamelist-view.c:61 ../data/gmameui_prefs.glade.h:10
+#: ../src/gmameui-gamelist-view.c:61
+#: ../data/gmameui_prefs.glade.h:10
 msgid "Driver"
 msgstr "Driver"
 
 #. Available / Not Available
 #: ../src/gmameui-gamelist-view.c:63
-#, fuzzy
 msgid "Status"
 msgstr "Status"
 
@@ -449,30 +491,26 @@ msgid "Driver Status"
 msgstr "Status do Driver"
 
 #: ../src/gmameui-gamelist-view.c:69
-#, fuzzy
 msgid "Driver Colors"
-msgstr "Som do Driver"
+msgstr "Cores do Driver"
 
 #: ../src/gmameui-gamelist-view.c:71
 msgid "Driver Sound"
 msgstr "Som do Driver"
 
 #: ../src/gmameui-gamelist-view.c:73
-#, fuzzy
 msgid "Driver Graphics"
 msgstr "Gráfico do Driver"
 
 #: ../src/gmameui-gamelist-view.c:75
-#, fuzzy
 msgid "Players"
-msgstr "Jogados"
+msgstr "Jogadores"
 
 #: ../src/gmameui-gamelist-view.c:77
 msgid "Buttons"
 msgstr "Botões"
 
 #: ../src/gmameui-gamelist-view.c:83
-#, fuzzy
 msgid "Favorite"
 msgstr "Favorito"
 
@@ -480,12 +518,13 @@ msgstr "Favorito"
 msgid "Channels"
 msgstr "Canais"
 
-#: ../src/gmameui-gamelist-view.c:87 ../src/interface.c:687
+#: ../src/gmameui-gamelist-view.c:87
+#: ../src/interface.c:687
 msgid "BIOS"
 msgstr "BIOS"
 
 #: ../src/gmameui-gamelist-view.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "Hide \"%s\" Column"
 msgstr "Esconder \"%s\" Coluna"
 
@@ -493,19 +532,20 @@ msgstr "Esconder \"%s\" Coluna"
 msgid "Wait..."
 msgstr "Espere..."
 
-#: ../src/gmameui-gamelist-view.c:779 ../src/gui.c:1396
+#: ../src/gmameui-gamelist-view.c:779
+#: ../src/gui.c:1396
 msgid "Yes"
 msgstr "Sim"
 
-#: ../src/gmameui-gamelist-view.c:779 ../src/gui.c:1396
+#: ../src/gmameui-gamelist-view.c:779
+#: ../src/gui.c:1396
 msgid "No"
 msgstr "Não"
 
 #. Status Bar Message
 #: ../src/gmameui-gamelist-view.c:890
-#, fuzzy
 msgid "games"
-msgstr "jogo"
+msgstr "jogos"
 
 #: ../src/gmameui-gamelist-view.c:890
 msgid "game"
@@ -514,26 +554,27 @@ msgstr "jogo"
 #: ../src/gui.c:489
 #, c-format
 msgid "Found file name %s with CRC: %u, size %i"
-msgstr ""
+msgstr "Encontrado nome do arquivo %s com CRC: %u, tamanho %i"
 
 #: ../src/gui.c:497
 #, c-format
 msgid "Attempting to uncompress %s"
-msgstr ""
+msgstr "Tentando descomprimir %s"
 
 #: ../src/gui.c:503
 msgid "Loaded pixbuf"
-msgstr ""
+msgstr "Carregado pixbuf"
 
-#: ../src/gui.c:505 ../src/gui.c:527
+#: ../src/gui.c:505
+#: ../src/gui.c:527
 #, c-format
 msgid "Error while uncompressing %s: %s"
-msgstr ""
+msgstr "Erro ao descomprimir %s: %s"
 
 #: ../src/gui.c:650
 #, c-format
 msgid "Error - cannot open zip file %s"
-msgstr ""
+msgstr "Erro - não é possível abrir o arquivo zip %s"
 
 #: ../src/gui.c:742
 #, c-format
@@ -541,7 +582,7 @@ msgid "Time to initialise icons: %.02f seconds"
 msgstr "Tempo para inicializar ícones: %.02f segundos"
 
 #: ../src/gui.c:747
-#, fuzzy, c-format
+#, c-format
 msgid "Time to create main window, filters and gamelist: %.02f seconds"
 msgstr "Tempo para criar janela principal e filtros: %.02f segundos"
 
@@ -556,9 +597,8 @@ msgid "%s is not a valid executable"
 msgstr "%s não é um executável válido"
 
 #: ../src/gui.c:860
-#, fuzzy
 msgid "No executables"
-msgstr "Nenhum executável do xmame foi definido"
+msgstr "Nenhum executável"
 
 #. update statusbar
 #: ../src/gui.c:1359
@@ -571,412 +611,385 @@ msgstr "Escolha um arquivo inp para tocar"
 
 #: ../src/gui.c:1495
 msgid "File exists"
-msgstr ""
+msgstr "Arquivo existente"
 
 #: ../src/gui.c:1497
-#, fuzzy, c-format
+#, c-format
 msgid "A file named '%s' already exists. Do you want to overwrite it?"
-msgstr ""
-"Um arqueivo de nome '%s' já existe.\n"
-"Deseja sobreescrever-lo?"
+msgstr "Um arquivo de nome '%s' já existe. Deseja sobreescrever-lo?"
 
 #. Toplevel
 #: ../src/gui.h:52
-#, fuzzy
 msgid "_File"
-msgstr "Jogadores"
+msgstr "_Arquivo"
 
 #: ../src/gui.h:53
 msgid "_View"
-msgstr ""
+msgstr "_Ver"
 
 #: ../src/gui.h:54
-#, fuzzy
 msgid "_Options"
-msgstr "Opções GGI"
+msgstr "_Opções"
 
 #: ../src/gui.h:55
 msgid "_Help"
-msgstr ""
+msgstr "_Ajuda"
 
 #. File menu
 #: ../src/gui.h:58
 msgid "_Select Random Game"
-msgstr ""
+msgstr "_Selecionar Jogo Randomicamente"
 
-#: ../src/gui.h:59 ../src/gui.h:86
+#: ../src/gui.h:59
+#: ../src/gui.h:86
 msgid "Play currently selected game"
-msgstr ""
+msgstr "Jogar atual jogo selecionado"
 
 #: ../src/gui.h:60
 msgid "_Quit"
-msgstr ""
+msgstr "_Encerrar"
 
 #: ../src/gui.h:61
-#, fuzzy
 msgid "Quit GMAMEUI"
-msgstr "Sobre GMAMEUI"
+msgstr "Encerrar GMAMEUI"
 
 #. View menu
 #: ../src/gui.h:64
-#, fuzzy
 msgid "Refresh"
-msgstr "jogos"
+msgstr "Atualizar"
 
 #: ../src/gui.h:65
-#, fuzzy
 msgid "Refresh game list"
-msgstr "Criando lista de jogos..."
+msgstr "Atualizar lista de jogos"
 
 #. Option menu
 #: ../src/gui.h:68
-#, fuzzy
 msgid "_Directories..."
-msgstr "Diretório"
+msgstr "_Diretórios_"
 
 #: ../src/gui.h:69
 msgid "Set directory configuration"
-msgstr ""
+msgstr "Definir configuração de diretório"
 
 #: ../src/gui.h:70
 msgid "_GMAMEUI Preferences..."
-msgstr ""
+msgstr "_GMAMEUI Preferências..."
 
 #: ../src/gui.h:71
 msgid "Set GMAMEUI preferences"
-msgstr ""
+msgstr "Definir GMAMEUI preferências"
 
 #. Help menu
 #: ../src/gui.h:74
-#, fuzzy
 msgid "_Contents"
-msgstr "Clone de"
+msgstr "_Conteúdos"
 
 #: ../src/gui.h:75
 msgid "Open the GMAMEUI manual"
-msgstr ""
+msgstr "Abrir o manual do GMAMEUI"
 
 #: ../src/gui.h:77
 msgid "About this application"
-msgstr ""
+msgstr "Sobre esta aplicação"
 
 #. File menu
 #: ../src/gui.h:85
-#, fuzzy
 msgid "Play"
-msgstr "Jogados"
+msgstr "Jogar"
 
 #: ../src/gui.h:87
 msgid "Play and Record Input..."
-msgstr ""
+msgstr "Jogar e Gravar Entrada"
 
 #: ../src/gui.h:88
 msgid "Record a game for later playback"
-msgstr ""
+msgstr "Gravar um jogo para posterior reprodução"
 
 #: ../src/gui.h:89
 msgid "Playback Input..."
-msgstr ""
+msgstr "Entrada de Reprodução..."
 
 #: ../src/gui.h:90
-#, fuzzy
 msgid "Playback a recorded game"
-msgstr "Jogar e escolher jogos clássicos de fliperama"
+msgstr "Reproduzir um jogo gravado"
 
 #: ../src/gui.h:91
-#, fuzzy
 msgid "Options"
-msgstr "Opções GGI"
+msgstr "Opções"
 
 #: ../src/gui.h:92
 msgid "Change the options of the selected game"
-msgstr ""
+msgstr "Alterar as opções do jogo selecionado"
 
 #: ../src/gui.h:98
 msgid "_Audit All Games"
-msgstr ""
+msgstr "_Auditar todos os Jogos"
 
 #: ../src/gui.h:99
 msgid "Audit ROM and sample sets"
-msgstr ""
+msgstr "Auditar ROM e definições de amostra"
 
 #: ../src/gui.h:100
 msgid "_Rebuild Game List"
-msgstr ""
+msgstr "_Regerar Lista de Jogos"
 
 #: ../src/gui.h:101
 msgid "Rebuild the game list from executable information"
-msgstr ""
+msgstr "Regerar lista de jogos a partir de informações de executável"
 
 #: ../src/gui.h:102
-#, fuzzy
 msgid "Default _Options..."
-msgstr "Propriedades Padrão"
+msgstr "Pr_opriedades Padrão..."
 
 #: ../src/gui.h:103
-#, fuzzy
 msgid "Set default game options"
-msgstr "Opções globais do jogo"
+msgstr "Definir opções padrão do jogo"
 
 #: ../src/gui.h:109
-#, fuzzy
 msgid "Properties"
-msgstr "Propriedades para %s"
+msgstr "Propriedades"
 
 #: ../src/gui.h:110
 msgid "Display the properties of the selected game"
-msgstr ""
+msgstr "Exibir as propriedades do jogo selecionado"
 
 #: ../src/gui.h:115
-#, fuzzy
 msgid "Add to 'Favorites'"
-msgstr "Favorito"
+msgstr "Adicionar aos 'Favoritos'"
 
 #: ../src/gui.h:116
 msgid "Add this game to your 'Favorites' game folder"
-msgstr ""
+msgstr "Adicione este jogo a sua pasta jogos 'Favoritos'"
 
 #: ../src/gui.h:117
 msgid "Remove from 'Favorites'"
-msgstr ""
+msgstr "Remover dos 'Favoritos'"
 
 #: ../src/gui.h:118
 msgid "Remove this game from your 'Favorites' game folder"
-msgstr ""
+msgstr "Remover este jogo da sua pasta jogos 'Favoritos'"
 
 #: ../src/gui.h:124
 msgid "Expand All"
-msgstr ""
+msgstr "Expandir Tudo"
 
 #: ../src/gui.h:125
 msgid "Expand all rows"
-msgstr ""
+msgstr "Expandir todas as linhas"
 
 #: ../src/gui.h:126
 msgid "Collapse All"
-msgstr ""
+msgstr "Recolher Tudo"
 
 #: ../src/gui.h:127
 msgid "Collapse all rows"
-msgstr ""
+msgstr "Recolher todas as linhas"
 
 #: ../src/gui.h:132
 msgid "_Toolbar"
-msgstr ""
+msgstr "_Barra de Ferramentas"
 
 #: ../src/gui.h:133
-#, fuzzy
 msgid "Show or hide the toolbar"
-msgstr "Mostrar Barra Lateral"
+msgstr "Exibir ou esconder a barra de ferramentas"
 
 #: ../src/gui.h:135
-#, fuzzy
 msgid "_Status Bar"
-msgstr "Status"
+msgstr "Barra de _Status"
 
 #: ../src/gui.h:136
 msgid "Show or hide the status bar"
-msgstr ""
+msgstr "Exibir ou esconder a barra de status"
 
 #: ../src/gui.h:138
 msgid "Fold_er List"
-msgstr ""
+msgstr "Lista d_e Pastas"
 
 #: ../src/gui.h:139
 msgid "Show or hide the folder list"
-msgstr ""
+msgstr "Exibir ou esconder a lista de pastas"
 
 #: ../src/gui.h:141
 msgid "Scree_nshot Panel"
-msgstr ""
+msgstr "Painel de Scree_nshot"
 
 #: ../src/gui.h:142
 msgid "Show or hide the screenshot panel"
-msgstr ""
+msgstr "Exibir ou esconder o painel de screenshot"
 
 #: ../src/gui.h:148
-#, fuzzy
 msgid "_List"
-msgstr "Lista"
+msgstr "_Lista"
 
 #: ../src/gui.h:149
 msgid "Displays items in a list"
-msgstr ""
+msgstr "Exibe itens em uma lista"
 
 #: ../src/gui.h:150
-#, fuzzy
 msgid "List _Tree"
-msgstr "Lista de Árvore"
+msgstr "Lis_ta de Árvore"
 
 #: ../src/gui.h:151
 msgid "Displays items in a tree list with clones indented"
-msgstr ""
+msgstr "Exibe itens em uma lista com árvore clones indentados"
 
 #: ../src/gui.h:152
-#, fuzzy
 msgid "_Details"
-msgstr "Detalhes"
+msgstr "_Detalhes"
 
 #: ../src/gui.h:153
 msgid "Displays detailed information about each item"
-msgstr ""
+msgstr "Mostra informação detalhada sobre cada item"
 
 #: ../src/gui.h:154
-#, fuzzy
 msgid "Detai_ls Tree"
-msgstr "Detalhes Árvore"
+msgstr "Deta_lhes Árvore"
 
 #: ../src/gui.h:155
 msgid "Displays detailed information about each item with clones indented"
-msgstr ""
+msgstr "Mostra informação detalhada sobre cada item com clones indentados"
 
-#: ../src/gui.h:160 ../src/gui.h:161
-#, fuzzy
+#: ../src/gui.h:160
+#: ../src/gui.h:161
 msgid "Hide Column"
-msgstr "Esconder \"%s\" Coluna"
+msgstr "Esconder Coluna"
 
 #: ../src/gui_prefs.c:951
 #, c-format
 msgid "Retrieving default boolean value for %s: %i"
-msgstr ""
+msgstr "Recuperando valor padrão boleano para %s: %i"
 
 #: ../src/gui_prefs.c:980
 #, c-format
 msgid "Retrieving default integer value for %s: %i"
-msgstr ""
+msgstr "Recuperando valor padrão inteiro para %s: %i"
 
 #: ../src/gui_prefs.c:1009
 #, c-format
 msgid "Retrieving default string value for %s: %s"
-msgstr ""
+msgstr "Recuperando valor padrão texto para %s: %s"
 
-#: ../src/gui_prefs_dialog.c:258 ../data/gmameui_prefs.glade.h:12
+#: ../src/gui_prefs_dialog.c:258
+#: ../data/gmameui_prefs.glade.h:12
 msgid "GMAMEUI Preferences"
-msgstr ""
+msgstr "GMAMEUI Preferências"
 
 #: ../src/interface.c:359
 msgid "GMAMEUI Arcade Machine Emulator"
 msgstr "GMAMEUI Interface Gráfica para Emulador de Filperama"
 
 #: ../src/interface.c:531
-#, fuzzy
 msgid "All ROMs"
-msgstr "ROMs"
+msgstr "Todas as ROMs"
 
 #: ../src/interface.c:563
-#, fuzzy
 msgid "Unavailable"
 msgstr "Não disponível"
 
-#: ../src/interface.c:578 ../src/properties.c:368
+#: ../src/interface.c:578
+#: ../src/properties.c:368
 msgid "Incorrect"
 msgstr "Incorreto"
 
 #: ../src/interface.c:596
 msgid "Neo-Geo"
-msgstr ""
+msgstr "Neo-Geo"
 
 #: ../src/interface.c:609
 msgid "CPS1"
-msgstr ""
+msgstr "CPS1"
 
 #: ../src/interface.c:622
 msgid "CPS2"
-msgstr ""
+msgstr "CPS2"
 
 #: ../src/interface.c:635
 msgid "CPS3"
-msgstr ""
+msgstr "CPS3"
 
 #: ../src/interface.c:648
 msgid "Sega System 16"
-msgstr ""
+msgstr "Sega System 16"
 
 #: ../src/interface.c:661
 msgid "Sega Model 2"
-msgstr ""
+msgstr "Sega Model 2"
 
 #: ../src/interface.c:674
 msgid "Namco System 22"
-msgstr ""
+msgstr "Namco System 22"
 
 #: ../src/interface.c:701
-#, fuzzy
 msgid "Favorites"
-msgstr "Favorito"
+msgstr "Favoritos"
 
 #: ../src/interface.c:730
-#, fuzzy
 msgid "Colors"
-msgstr "%i cores"
+msgstr "Cores"
 
 #: ../src/interface.c:758
-#, fuzzy
 msgid "Graphics"
-msgstr "Gráfico do Driver"
+msgstr "Gráficos"
 
 #: ../src/interface.c:773
 msgid "Originals"
-msgstr ""
+msgstr "Originais"
 
 #: ../src/interface.c:786
-#, fuzzy
 msgid "Clones"
-msgstr "Clone de"
+msgstr "Clones"
 
 #: ../src/interface.c:813
-#, fuzzy
 msgid "Stereo"
-msgstr "Servidor"
+msgstr "Estéreo"
 
 #: ../src/interface.c:827
 msgid "Raster"
-msgstr ""
+msgstr "Raster"
 
-#: ../src/interface.c:840 ../src/options.c:2613 ../data/options.glade.h:76
+#: ../src/interface.c:840
+#: ../src/options.c:2613
+#: ../data/options.glade.h:76
 #: ../data/properties.glade.h:154
 msgid "Vector"
 msgstr "Vetor"
 
 #: ../src/interface.c:880
 msgid "Trackball"
-msgstr ""
+msgstr "Trackball"
 
 #: ../src/interface.c:894
 msgid "Lightgun"
-msgstr ""
+msgstr "Lightgun"
 
 #: ../src/interface.h:69
 msgid "Play Game"
 msgstr "Iniciar Jogo"
 
 #: ../src/interface.h:70
-#, fuzzy
 msgid "Show Folders"
-msgstr "Navegar para a Pasta"
+msgstr "Mostrar Pastas"
 
 #: ../src/interface.h:71
-#, fuzzy
 msgid "Show Sidebar"
-msgstr "Mostrar Barra Lateral"
+msgstr "Exibir Barra Lateral"
 
 #: ../src/interface.h:72
-#, fuzzy
 msgid "List"
 msgstr "Lista"
 
 #: ../src/interface.h:73
-#, fuzzy
 msgid "List Tree"
 msgstr "Lista de Árvore"
 
-#: ../src/interface.h:74 ../data/audit_window.glade.h:10
-#: ../data/properties.glade.h:72 ../data/rom_info.glade.h:8
+#: ../src/interface.h:74
+#: ../data/audit_window.glade.h:10
+#: ../data/properties.glade.h:72
+#: ../data/rom_info.glade.h:8
 msgid "Details"
 msgstr "Detalhes"
 
 #: ../src/interface.h:75
-#, fuzzy
 msgid "Details Tree"
 msgstr "Detalhes Árvore"
 
@@ -992,7 +1005,8 @@ msgstr "Layout Francês"
 msgid "German Layout"
 msgstr "Layout Alemão"
 
-#: ../src/mameio.c:538 ../src/mameio.c:692
+#: ../src/mameio.c:538
+#: ../src/mameio.c:692
 msgid "Creating game list..."
 msgstr "Criando lista de jogos..."
 
@@ -1000,7 +1014,8 @@ msgstr "Criando lista de jogos..."
 msgid "Creating game list, please wait"
 msgstr "Criando lista de jogos, por favor espere"
 
-#: ../src/mameio.c:570 ../src/mameio.c:717
+#: ../src/mameio.c:570
+#: ../src/mameio.c:717
 #, c-format
 msgid "Creating game list (%d games)..."
 msgstr "Criando lista de jogos (%d jogos)..."
@@ -1030,25 +1045,24 @@ msgstr "Não é possível criar uma lista de jogos com esta versão do xmame!"
 #: ../src/mame_options.c:168
 #, c-format
 msgid "Checking that MAME supports the option %s..."
-msgstr ""
+msgstr "Checando se o MAME suporta a opção %s..."
 
 #: ../src/mame_options.c:170
 msgid "...it does"
-msgstr ""
+msgstr "...ele suporta"
 
 #: ../src/mame_options.c:174
 #, c-format
 msgid "Error retrieving options value for key %s in category %s: %s"
-msgstr ""
+msgstr "Erro ao recuperar valor da chave %s na categoria %s: %s"
 
 #: ../src/mame_options.c:204
 msgid "...it doesn't"
-msgstr ""
+msgstr "...ele não suporta"
 
 #: ../src/mame_options_dialog.c:226
-#, fuzzy
 msgid "MAME Options"
-msgstr "Opções GGI"
+msgstr "Opções do MAME"
 
 #: ../src/network_game.c:275
 msgid "Network game options"
@@ -1155,7 +1169,8 @@ msgstr "Desenhar todos os frame"
 msgid "Skip %i of 12 frames"
 msgstr "Saltar %i de 12 frames"
 
-#: ../src/options.c:919 ../src/options.c:2435
+#: ../src/options.c:919
+#: ../src/options.c:2435
 msgid "Auto"
 msgstr "Auto"
 
@@ -1191,7 +1206,8 @@ msgstr "No sentido anti-horário"
 msgid "GGI options"
 msgstr "Opções GGI"
 
-#: ../src/options.c:1447 ../src/options.c:1542
+#: ../src/options.c:1447
+#: ../src/options.c:1542
 msgid "linear framebuffer (fast)"
 msgstr "linear framebuffer (rápido)"
 
@@ -1219,7 +1235,8 @@ msgstr "Centro X:"
 msgid "Center Y:"
 msgstr "Centro Y:"
 
-#: ../src/options.c:1705 ../data/properties.glade.h:126
+#: ../src/options.c:1705
+#: ../data/properties.glade.h:126
 msgid "Rendering"
 msgstr "Renderizando"
 
@@ -1257,11 +1274,13 @@ msgstr "Carregando Jogo..."
 msgid "rom"
 msgstr "rom"
 
-#: ../src/properties.c:72 ../src/properties.c:74
+#: ../src/properties.c:72
+#: ../src/properties.c:74
 msgid "Can't audit game"
 msgstr "Não foi possível auditar jogo"
 
-#: ../src/properties.c:76 ../src/properties.c:317
+#: ../src/properties.c:76
+#: ../src/properties.c:317
 msgid "None required"
 msgstr "Nenhum requerido"
 
@@ -1324,468 +1343,448 @@ msgstr "Esta versão do GMAMEUI suporta %i executáveis do xmame."
 #: ../src/xmame_executable.c:1356
 #, c-format
 msgid "Getting list of valid MAME options using parameter %s"
-msgstr ""
+msgstr "Obter lista de opções válidas do MAME utilizando parâmetro %s"
 
 #. Note: Newer versions of MAME do not report the type
 #: ../src/xmame_executable.c:1375
 #, c-format
 msgid "Found option: %s %s%s (%s)"
-msgstr ""
+msgstr "Encontrada opção: %s %s%s (%s)"
 
 #: ../src/xmame_executable.c:1380
 #, c-format
 msgid "Description: \"%s\""
-msgstr ""
+msgstr "Descrição: \"%s\""
 
 #: ../src/xmame_executable.c:1384
 msgid "Possible values: "
-msgstr ""
+msgstr "Possíveis valores:"
 
 #: ../data/audit_window.glade.h:1
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../data/audit_window.glade.h:2
-#, fuzzy
 msgid "<b>Details</b>"
-msgstr "Detalhes"
+msgstr "<b>Detalhes</b>"
 
 #: ../data/audit_window.glade.h:3
 msgid "<b>ROMs</b>"
-msgstr ""
+msgstr "<b>ROMs</b>"
 
 #: ../data/audit_window.glade.h:4
-#, fuzzy
 msgid "<b>Samples</b>"
-msgstr "Amostras"
+msgstr "<b>Amostras</b>"
 
 #: ../data/audit_window.glade.h:7
-#, fuzzy
 msgid "Best available:"
-msgstr "Melhor disponível"
+msgstr "Melhor disponível:"
 
 #: ../data/audit_window.glade.h:8
-#, fuzzy
 msgid "Checking Games"
-msgstr "Checando..."
+msgstr "Checando jogos"
 
 #: ../data/audit_window.glade.h:9
-#, fuzzy
 msgid "Correct:"
-msgstr "Incorreto"
+msgstr "Correto:"
 
 #: ../data/audit_window.glade.h:11
-msgid ""
-"GMAMEUI is now auditing the ROMs in the specified ROM paths. This may take "
-"some time."
-msgstr ""
+msgid "GMAMEUI is now auditing the ROMs in the specified ROM paths. This may take some time."
+msgstr "GMAMEUI está agora a auditando as ROMs no caminho especificado. Isto pode levar algum tempo."
 
 #: ../data/audit_window.glade.h:12
-#, fuzzy
 msgid "Incorrect:"
-msgstr "Incorreto"
+msgstr "Incorreto:"
 
 #: ../data/audit_window.glade.h:13
-#, fuzzy
 msgid "Not found:"
-msgstr "Não encontrado"
+msgstr "Não encontrado:"
 
 #: ../data/audit_window.glade.h:14
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
-#: ../data/audit_window.glade.h:15 ../data/gmameui_prefs.glade.h:23
+#: ../data/audit_window.glade.h:15
+#: ../data/gmameui_prefs.glade.h:23
 #: ../data/rom_info.glade.h:15
-#, fuzzy
 msgid "gtk-close"
-msgstr "No sentido anti-horário"
+msgstr "gtk-close"
 
 #: ../data/audit_window.glade.h:16
 msgid "gtk-stop"
-msgstr ""
+msgstr "gtk-stop"
 
 #: ../data/directories.glade.h:1
 msgid " "
-msgstr ""
+msgstr " "
 
 #: ../data/directories.glade.h:2
 msgid "<b>MAME Executables</b>"
-msgstr ""
+msgstr "<b>Executáveis do MAME</b>"
 
 #: ../data/directories.glade.h:3
 msgid "<b>MAME Paths</b>"
-msgstr ""
+msgstr "<b>Caminhos do MAME</b>"
 
 #: ../data/directories.glade.h:4
 msgid "<b>MAME Support Files</b>"
-msgstr ""
+msgstr "<b>Arquivos Suportados do MAME</b>"
 
 #: ../data/directories.glade.h:5
 msgid "Artwork:"
-msgstr ""
+msgstr "Artwork:"
 
 #: ../data/directories.glade.h:6
 msgid "Browse..."
-msgstr ""
+msgstr "Navegar..."
 
 #: ../data/directories.glade.h:7
 msgid "Cabinets:"
-msgstr ""
+msgstr "Gabinetes:"
 
 #: ../data/directories.glade.h:8
 msgid "Catver file:"
-msgstr ""
+msgstr "Arquivo Catver:"
 
 #: ../data/directories.glade.h:9
 msgid "Cheat file:"
-msgstr ""
+msgstr "Arquivo de Cheat:"
 
 #: ../data/directories.glade.h:10
-#, fuzzy
 msgid "Control panels:"
-msgstr "Controles"
+msgstr "Paineis de controle:"
 
 #: ../data/directories.glade.h:11
-#, fuzzy
 msgid "Controller directory:"
-msgstr "Controles"
+msgstr "Direório de controles"
 
 #: ../data/directories.glade.h:12
-#, fuzzy
 msgid "Directories Selection"
-msgstr "Seleção de cor do Clone"
+msgstr "Diretórios Seleção"
 
 #: ../data/directories.glade.h:13
-#, fuzzy
 msgid "Flyers:"
-msgstr "Jogadores"
+msgstr "Flyers:"
 
 #: ../data/directories.glade.h:14
 msgid "High score file:"
-msgstr ""
+msgstr "Arquivo de Maiores Escores:"
 
 #: ../data/directories.glade.h:15
 msgid "History file:"
-msgstr ""
+msgstr "Arquivo de Histórico:"
 
 #: ../data/directories.glade.h:16
-#, fuzzy
 msgid "Icons directory:"
-msgstr "Diretório"
+msgstr "Diretório de ícones:"
 
 #: ../data/directories.glade.h:17
 msgid "MAME Main Paths"
-msgstr ""
+msgstr "Caminhos Principais do MAME"
 
 #: ../data/directories.glade.h:18
 msgid "MAME Paths"
-msgstr ""
+msgstr "Caminhos do MAME"
 
 #: ../data/directories.glade.h:19
 msgid "MAME Support Files"
-msgstr ""
+msgstr "Arquivos de Suporte do MAME"
 
 #: ../data/directories.glade.h:20
 msgid "MAME executables"
-msgstr ""
+msgstr "Executáveis do MAME"
 
 #: ../data/directories.glade.h:21
 msgid "MAME info file:"
-msgstr ""
+msgstr "Arquivos de Informações do MAME"
 
 #: ../data/directories.glade.h:22
 msgid "Marquees:"
-msgstr ""
+msgstr "Marquees:"
 
 #: ../data/directories.glade.h:25
 msgid "Snapshots:"
-msgstr ""
+msgstr "Snapshots:"
 
 #: ../data/directories.glade.h:26
 msgid "Title screenshots:"
-msgstr ""
+msgstr "Títulos screenshots:"
 
 #: ../data/directories.glade.h:27
 msgid "gtk-add"
-msgstr ""
+msgstr "gtk-add"
 
 #: ../data/directories.glade.h:28
 msgid "gtk-cancel"
-msgstr ""
+msgstr "gtk-cancel"
 
 #: ../data/directories.glade.h:29
 msgid "gtk-ok"
-msgstr ""
+msgstr "gtk-ok"
 
 #: ../data/directories.glade.h:30
 msgid "gtk-remove"
-msgstr ""
+msgstr "gtk-remove"
 
 #: ../data/gmameui_prefs.glade.h:1
 msgid "'The' as a prefix"
-msgstr ""
+msgstr "'O' como um prefixo"
 
-#: ../data/gmameui_prefs.glade.h:2 ../data/options.glade.h:5
-#, fuzzy
+#: ../data/gmameui_prefs.glade.h:2
+#: ../data/options.glade.h:5
 msgid "<b>Miscellaneous Options</b>"
-msgstr "Diversos"
+msgstr "<b>Opções diversas</b>"
 
 #: ../data/gmameui_prefs.glade.h:3
 msgid "<b>Startup Options</b>"
-msgstr ""
+msgstr "<b>Opções de Inicialização</b>"
 
 #: ../data/gmameui_prefs.glade.h:4
 msgid "<b>Visible Columns</b>"
-msgstr ""
+msgstr "<b>Colunas Visíveis</b>"
 
 #: ../data/gmameui_prefs.glade.h:5
 msgid "Allow game selection with a joystick"
-msgstr ""
+msgstr "Permitir seleção jogo com um joystick"
 
 #: ../data/gmameui_prefs.glade.h:7
-#, fuzzy
 msgid "Clone Colour"
-msgstr "Clone de"
+msgstr "Clone de Cor"
 
 #: ../data/gmameui_prefs.glade.h:11
 msgid "Enable version mismatch warning"
-msgstr ""
+msgstr "Ativar advertência de erro de versão"
 
 #: ../data/gmameui_prefs.glade.h:13
-#, fuzzy
 msgid "Game Name"
-msgstr "Jogo"
+msgstr "Nome do Jogo"
 
 #: ../data/gmameui_prefs.glade.h:14
-#, fuzzy
 msgid "Joystick device:"
-msgstr "Joystick %s encontrado"
+msgstr "Dispositivo de Joystick:"
 
 #: ../data/gmameui_prefs.glade.h:16
 msgid "Playcount"
-msgstr ""
+msgstr "Playcount"
 
 #: ../data/gmameui_prefs.glade.h:18
 msgid "Search for new games"
-msgstr ""
+msgstr "Procurar por jogos novos"
 
 #: ../data/gmameui_prefs.glade.h:19
 msgid "Use MAME default options"
-msgstr ""
+msgstr "Utilizar opções predefinidas do MAME"
 
 #: ../data/gmameui_prefs.glade.h:22
 msgid "clone_label"
-msgstr ""
+msgstr "clonar_etiqueta"
 
-#: ../data/gmameui_prefs.glade.h:24 ../data/rom_info.glade.h:16
+#: ../data/gmameui_prefs.glade.h:24
+#: ../data/rom_info.glade.h:16
 msgid "label"
-msgstr ""
+msgstr "etiqueta"
 
 #: ../data/gmameui_prefs.glade.h:25
 msgid "original_label"
-msgstr ""
+msgstr "etiqueta_original"
 
 #: ../data/options.glade.h:1
 msgid "1"
-msgstr ""
+msgstr "1"
 
-#: ../data/options.glade.h:2 ../data/properties.glade.h:15
+#: ../data/options.glade.h:2
+#: ../data/properties.glade.h:15
 msgid "<b>Artwork</b>"
-msgstr ""
+msgstr "<b>Artwork</b>"
 
 #: ../data/options.glade.h:3
-#, fuzzy
 msgid "<b>Debugging</b>"
-msgstr "Debugando"
+msgstr "<b>Debugando</b>"
 
 #: ../data/options.glade.h:4
 msgid "<b>Input</b>"
-msgstr ""
+msgstr "<b>Entrada</b>"
 
 #: ../data/options.glade.h:6
 msgid "<b>OpenGL</b>"
-msgstr ""
+msgstr "<b>OpenGL</b>"
 
 #: ../data/options.glade.h:7
 msgid "<b>Performance</b>"
-msgstr ""
+msgstr "<b>Performance</b>"
 
-#: ../data/options.glade.h:8 ../data/properties.glade.h:38
+#: ../data/options.glade.h:8
+#: ../data/properties.glade.h:38
 msgid "<b>Rotation</b>"
-msgstr ""
+msgstr "<b>Rotação</b>"
 
 #: ../data/options.glade.h:9
 msgid "<b>Screen</b>"
-msgstr ""
+msgstr "<b>Tela</b>"
 
 #: ../data/options.glade.h:10
 msgid "<b>Sound</b>"
-msgstr ""
+msgstr "<b>Som</b>"
 
 #: ../data/options.glade.h:11
-#, fuzzy
 msgid "<b>Vector</b>"
-msgstr "Vetor"
+msgstr "<b>Vetor</b>"
 
 #: ../data/options.glade.h:12
 msgid "<b>Video</b>"
-msgstr ""
+msgstr "<b>Vídeo</b>"
 
 #: ../data/options.glade.h:13
 msgid "Allow uneven stretching"
-msgstr ""
+msgstr "Permitir alongamento desigual "
 
 #: ../data/options.glade.h:14
-#, fuzzy
 msgid "Antialias"
-msgstr "No sentido anti-horário"
+msgstr "Antialias"
 
 #: ../data/options.glade.h:15
 msgid "Artwork"
-msgstr ""
+msgstr "Artwork"
 
 #: ../data/options.glade.h:16
 msgid "Audio latency"
-msgstr ""
+msgstr "Áudio latência"
 
 #: ../data/options.glade.h:17
 msgid "Automatic Rotation"
-msgstr ""
+msgstr "Rotação Automática"
 
 #: ../data/options.glade.h:18
 msgid "Automatic frameskip"
-msgstr ""
+msgstr "Automático frameskip"
 
 #: ../data/options.glade.h:19
-#, fuzzy
 msgid "BIOS name"
-msgstr "BIOS"
+msgstr "Nome da BIOS"
 
 #: ../data/options.glade.h:20
 msgid "Beam width:"
-msgstr ""
+msgstr "Largura de Feixe:"
 
 #: ../data/options.glade.h:21
 msgid "Brightness"
-msgstr ""
+msgstr "Brilho"
 
 #: ../data/options.glade.h:22
-#, fuzzy
 msgid "Centre:"
-msgstr "Centro X:"
+msgstr "Centro:"
 
 #: ../data/options.glade.h:23
-#, fuzzy
 msgid "Contrast"
-msgstr "Controles"
+msgstr "Contraste"
 
 #: ../data/options.glade.h:24
-#, fuzzy
 msgid "Controller directory"
-msgstr "Controles"
+msgstr "Diretório de controles"
 
 #: ../data/options.glade.h:25
 msgid "Convert lightgun button 2 to offscreen support"
-msgstr ""
+msgstr "Converter botão 2 do lightgun para suporte a offscreen"
 
-#: ../data/options.glade.h:26 ../data/properties.glade.h:69
+#: ../data/options.glade.h:26
+#: ../data/properties.glade.h:69
 msgid "Crop artwork"
-msgstr ""
+msgstr "Cortar artwork"
 
 #: ../data/options.glade.h:27
-#, fuzzy
 msgid "Debug"
-msgstr "Debugando"
+msgstr "Debug"
 
 #: ../data/options.glade.h:28
 msgid "Debug script:"
-msgstr ""
+msgstr "Script de Debug:"
 
 #: ../data/options.glade.h:29
 msgid "Effect name:"
-msgstr ""
+msgstr "Nome do efeito:"
 
 #: ../data/options.glade.h:30
 msgid "Enable cheat mode"
-msgstr ""
+msgstr "Habilitar modo de trapaça"
 
 #: ../data/options.glade.h:31
 msgid "Enable input from multiple connected devices"
-msgstr ""
+msgstr "Ativar entrada a partir de múltiplos dispositivos conectados"
 
 #: ../data/options.glade.h:32
 msgid "Enable joystick"
-msgstr ""
+msgstr "Habilitar joystick"
 
 #: ../data/options.glade.h:33
 msgid "Enable lightgun"
-msgstr ""
+msgstr "Habilitar lightgun"
 
 #: ../data/options.glade.h:34
 msgid "Enable logging"
-msgstr ""
+msgstr "Habilitar registros"
 
 #: ../data/options.glade.h:35
 msgid "Enable mouse"
-msgstr ""
+msgstr "Habilitar mouse"
 
 #: ../data/options.glade.h:36
 msgid "Enable multithreading"
-msgstr ""
+msgstr "Habilitar multithreading"
 
 #: ../data/options.glade.h:37
 msgid "Enable samples"
-msgstr ""
+msgstr "Habilitar amostras"
 
-#: ../data/options.glade.h:38 ../data/properties.glade.h:86
-#, fuzzy
+#: ../data/options.glade.h:38
+#: ../data/properties.glade.h:86
 msgid "Enable sound"
-msgstr "(som)"
+msgstr "Habilitar som"
 
 #: ../data/options.glade.h:39
 msgid "Enable steadykey support"
-msgstr ""
+msgstr "Habilitar suporte a steadykey"
 
 #: ../data/options.glade.h:40
 msgid "Filter"
-msgstr ""
+msgstr "Filtro"
 
 #: ../data/options.glade.h:41
 msgid "Flicker:"
-msgstr ""
+msgstr "Flicker:"
 
 #: ../data/options.glade.h:42
 msgid "Flip"
-msgstr ""
+msgstr "Flip"
 
-#: ../data/options.glade.h:43 ../data/properties.glade.h:93
+#: ../data/options.glade.h:43
+#: ../data/properties.glade.h:93
 msgid "Frames to skip:"
-msgstr ""
+msgstr "Frames a saltar:"
 
 #: ../data/options.glade.h:44
-#, fuzzy
 msgid "Gamma"
-msgstr "Jogo"
+msgstr "Gamma"
 
 #: ../data/options.glade.h:45
 msgid "Horizontal"
-msgstr ""
+msgstr "Horizontal"
 
-#: ../data/options.glade.h:46 ../data/properties.glade.h:109
+#: ../data/options.glade.h:46
+#: ../data/properties.glade.h:109
 msgid "Keep aspect ratio"
-msgstr ""
+msgstr "Manter a relação de aspecto"
 
 #: ../data/options.glade.h:47
 msgid "Keyboard"
-msgstr ""
+msgstr "Teclado"
 
 #: ../data/options.glade.h:48
 msgid "Left-right"
-msgstr ""
+msgstr "Esquerda-Direita"
 
 #: ../data/options.glade.h:49
 msgid "Mouse"
-msgstr ""
+msgstr "Mouse"
 
 #: ../data/options.glade.h:50
 msgid ""
@@ -1793,125 +1792,127 @@ msgid ""
 "Bilinear\n"
 "Gaussian blur"
 msgstr ""
+"Sem filtror\n"
+"Bilinear\n"
+"Gaussian blur"
 
 #: ../data/options.glade.h:53
-#, fuzzy
 msgid "Number of screens:"
-msgstr "Número de jogadores"
+msgstr "Número de telas:"
 
 #: ../data/options.glade.h:54
-#, fuzzy
 msgid "Other options"
-msgstr "Opções GGI"
+msgstr "Outras opções"
 
 #: ../data/options.glade.h:55
 msgid "Pause Brightness"
-msgstr ""
+msgstr "Pausa Brilho"
 
 #: ../data/options.glade.h:56
 msgid "Prescale"
-msgstr ""
+msgstr "Preescala"
 
 #: ../data/options.glade.h:57
 msgid "Refresh speed"
-msgstr ""
+msgstr "Atualizar velocidade"
 
 #: ../data/options.glade.h:58
 msgid "Rotate left"
-msgstr ""
+msgstr "Girar esquerda"
 
 #: ../data/options.glade.h:59
 msgid "Rotate right"
-msgstr ""
+msgstr "Girar direita"
 
 #: ../data/options.glade.h:60
 msgid "Rotation"
-msgstr ""
+msgstr "Rotação"
 
 #: ../data/options.glade.h:61
 msgid "Run in window"
-msgstr ""
+msgstr "Executar em janela"
 
 #: ../data/options.glade.h:62
-#, fuzzy
 msgid "Sample rate"
-msgstr "Amostras"
+msgstr "Taxa de amostragem"
 
 #: ../data/options.glade.h:63
 msgid "Screen"
-msgstr ""
+msgstr "Tela"
 
 #: ../data/options.glade.h:64
-#, fuzzy
 msgid "Show FPS"
-msgstr "Mostrar Pastas"
+msgstr "Exibir FPS"
 
 #: ../data/options.glade.h:65
 msgid "Skip gameinfo"
-msgstr ""
+msgstr "Saltar informação de jogo"
 
 #: ../data/options.glade.h:66
 msgid "Sleep"
-msgstr ""
+msgstr "Dormir"
 
 #: ../data/options.glade.h:67
 msgid ""
 "Software\n"
 "OpenGL"
 msgstr ""
+"Software\n"
+"OpenGL"
 
 #: ../data/options.glade.h:69
-#, fuzzy
 msgid "Speed:"
-msgstr "Parada"
+msgstr "Velocidade:"
 
-#: ../data/options.glade.h:70 ../data/properties.glade.h:139
+#: ../data/options.glade.h:70
+#: ../data/properties.glade.h:139
 msgid "Throttle"
-msgstr ""
+msgstr "Throttle"
 
 #: ../data/options.glade.h:71
 msgid "Up-down"
-msgstr ""
+msgstr "Cima-Baixo"
 
 #: ../data/options.glade.h:72
 msgid "Update in pause"
-msgstr ""
+msgstr "Atualizar em pausa"
 
 #: ../data/options.glade.h:73
 msgid "Use backdrops"
-msgstr ""
+msgstr "Usar backdrops"
 
 #: ../data/options.glade.h:74
 msgid "Use bezels"
-msgstr ""
+msgstr "Usar bezels"
 
 #: ../data/options.glade.h:75
 msgid "Use overlays"
-msgstr ""
+msgstr "Usar overlays"
 
 #: ../data/options.glade.h:77
 msgid "Verbose logging"
-msgstr ""
+msgstr "Registros detalhados"
 
 #: ../data/options.glade.h:78
 msgid "Vertical"
-msgstr ""
+msgstr "Vertical"
 
 #: ../data/options.glade.h:79
 msgid "Video"
-msgstr ""
+msgstr "Vídeo"
 
-#: ../data/options.glade.h:80 ../data/properties.glade.h:155
+#: ../data/options.glade.h:80
+#: ../data/properties.glade.h:155
 msgid "Video mode:"
-msgstr ""
+msgstr "Modo de Vídeo"
 
 #: ../data/options.glade.h:81
 msgid "Volume"
-msgstr ""
+msgstr "Volume"
 
 #: ../data/options.glade.h:82
 msgid "YUV mode:"
-msgstr ""
+msgstr "Mode YUV:"
 
 #: ../data/options.glade.h:83
 msgid ""
@@ -1922,38 +1923,45 @@ msgid ""
 "aperture4x6\n"
 "scanlines"
 msgstr ""
+"aperture1x2rb\n"
+"aperture1x3rb\n"
+"aperture2x4bg\n"
+"aperture2x4rb\n"
+"aperture4x6\n"
+"scanlines"
 
-#: ../data/options.glade.h:89 ../data/properties.glade.h:163
+#: ../data/options.glade.h:89
+#: ../data/properties.glade.h:163
 msgid "dB"
-msgstr ""
+msgstr "dB"
 
 #: ../data/options.glade.h:90
 msgid "gl_forcepow2texture"
-msgstr ""
+msgstr "gl_forcepow2texture"
 
 #: ../data/options.glade.h:91
 msgid "gl_glsl"
-msgstr ""
+msgstr "gl_glsl"
 
 #: ../data/options.glade.h:92
 msgid "gl_glsl_filter"
-msgstr ""
+msgstr "gl_glsl_filter"
 
 #: ../data/options.glade.h:93
 msgid "gl_glsl_vid_attr"
-msgstr ""
+msgstr "gl_glsl_vid_attr"
 
 #: ../data/options.glade.h:94
 msgid "gl_notexturerect"
-msgstr ""
+msgstr "gl_notexturerect"
 
 #: ../data/options.glade.h:95
 msgid "gl_pbo"
-msgstr ""
+msgstr "gl_pbo"
 
 #: ../data/options.glade.h:96
 msgid "gl_vbo"
-msgstr ""
+msgstr "gl_vbo"
 
 #: ../data/options.glade.h:97
 msgid ""
@@ -1963,6 +1971,11 @@ msgid ""
 "yv12x2\n"
 "yuy2x2"
 msgstr ""
+"none\n"
+"yv12\n"
+"yuy2\n"
+"yv12x2\n"
+"yuy2x2"
 
 #: ../data/properties.glade.h:1
 msgid ""
@@ -1974,677 +1987,657 @@ msgid ""
 "/dev/audio\n"
 "/dev/null"
 msgstr ""
+"/dev/dsp\n"
+"/dev/dsp0\n"
+"/dev/dsp1\n"
+"/dev/dsp2\n"
+"/dev/dsp3\n"
+"/dev/audio\n"
+"/dev/null"
 
 #: ../data/properties.glade.h:8
 msgid "/dev/mixer"
-msgstr ""
+msgstr "/dev/mixer"
 
 #: ../data/properties.glade.h:9
 msgid "1:"
-msgstr ""
+msgstr "1:"
 
 #: ../data/properties.glade.h:10
 msgid "2:"
-msgstr ""
+msgstr "2:"
 
 #: ../data/properties.glade.h:11
 msgid "3:"
-msgstr ""
+msgstr "3:"
 
 #: ../data/properties.glade.h:12
 msgid "4:"
-msgstr ""
+msgstr "4:"
 
 #: ../data/properties.glade.h:13
 msgid "<b>Advanced options</b>"
-msgstr ""
+msgstr "<b>Opções avançadas</b>"
 
 #: ../data/properties.glade.h:14
 msgid "<b>Alsa sound system options</b>"
-msgstr ""
+msgstr "<b>Opções de sistema de som Alsa</b>"
 
 #: ../data/properties.glade.h:16
-#, fuzzy
 msgid "<b>Buffer size</b>"
-msgstr "Tamanho do Buffer %s"
+msgstr "<b>Tamanho do buffer</b>"
 
 #: ../data/properties.glade.h:17
 msgid "<b>CPU:</b>"
-msgstr ""
+msgstr "<b>CPU:</b>"
 
 #: ../data/properties.glade.h:18
-#, fuzzy
 msgid "<b>Clone of:</b>"
-msgstr "Clone de"
+msgstr "<b>Clone de:</b>"
 
 #: ../data/properties.glade.h:19
 msgid "<b>Colors:</b>"
-msgstr ""
+msgstr "<b>Cores:</b>"
 
 #: ../data/properties.glade.h:20
 msgid "<b>Control Panel</b>"
-msgstr ""
+msgstr "<b>Painel de Controle</b>"
 
 #: ../data/properties.glade.h:21
 msgid "<b>Corrections</b>"
-msgstr ""
+msgstr "<b>Correções</b>"
 
 #: ../data/properties.glade.h:22
 msgid "<b>Display options</b>"
-msgstr ""
+msgstr "<b>Mostrar opções</b>"
 
 #: ../data/properties.glade.h:23
 msgid "<b>Effects</b>"
-msgstr ""
+msgstr "<b>Efeitos</b>"
 
 #: ../data/properties.glade.h:24
 msgid "<b>FX (Glide) options</b>"
-msgstr ""
+msgstr "<b>Opções de FX (Glide)</b>"
 
 #: ../data/properties.glade.h:25
 msgid "<b>Frame skipping</b>"
-msgstr ""
+msgstr "<b>Saltando frame</b>"
 
 #: ../data/properties.glade.h:26
 msgid "<b>General sound options</b>"
-msgstr ""
+msgstr "<b>Opções gerais de som</b>"
 
 #: ../data/properties.glade.h:27
 msgid "<b>Joystick</b>"
-msgstr ""
+msgstr "<b>Joystick</b>"
 
 #: ../data/properties.glade.h:28
 msgid "<b>Key mapping</b>"
-msgstr ""
+msgstr "<b>Mapeamento de teclas</b>"
 
 #: ../data/properties.glade.h:29
 msgid "<b>Keyboard</b>"
-msgstr ""
+msgstr "<b>Teclado</b>"
 
 #: ../data/properties.glade.h:30
-#, fuzzy
 msgid "<b>Manufacturer:</b>"
-msgstr "Fabricante"
+msgstr "<b>Fabricante:</b>"
 
 #: ../data/properties.glade.h:31
 msgid "<b>Mouse / Trackball</b>"
-msgstr ""
+msgstr "<b>Mouse / Trackball</b>"
 
 #: ../data/properties.glade.h:32
 msgid "<b>OpenGL options</b>"
-msgstr ""
+msgstr "<b>OpenGL opções</b>"
 
 #: ../data/properties.glade.h:33
 msgid "<b>Other options</b>"
-msgstr ""
+msgstr "<b>Outras opções</b>"
 
 #: ../data/properties.glade.h:34
 msgid "<b>Photon options</b>"
-msgstr ""
+msgstr "<b>Opções de Photon</b>"
 
 #: ../data/properties.glade.h:35
 msgid "<b>QNX options</b>"
-msgstr ""
+msgstr "<b>Opções de QNX</b>"
 
 #: ../data/properties.glade.h:36
 msgid "<b>Resolution</b>"
-msgstr ""
+msgstr "<b>Resolução</b>"
 
 #: ../data/properties.glade.h:37
 msgid "<b>Rom check:</b>"
-msgstr ""
+msgstr "<b>Verificação de rom:</b>"
 
 #: ../data/properties.glade.h:39
-#, fuzzy
 msgid "<b>SDL options</b>"
-msgstr "Opções SVGA"
+msgstr "<b>Opções SDL</b>"
 
 #: ../data/properties.glade.h:40
 msgid "<b>Sample Check:</b>"
-msgstr ""
+msgstr "<b>Verificação simples:</b>"
 
 #: ../data/properties.glade.h:41
 msgid "<b>Screen:</b>"
-msgstr ""
+msgstr "<b>Tela:</b>"
 
 #: ../data/properties.glade.h:42
 msgid "<b>Sound:</b>"
-msgstr ""
+msgstr "<b>Som:</b>"
 
 #: ../data/properties.glade.h:43
 msgid "<b>Vector options</b>"
-msgstr ""
+msgstr "<b>Opções de Vetor</b>"
 
 #: ../data/properties.glade.h:44
 msgid "<b>Video mode</b>"
-msgstr ""
+msgstr "<b>Modo de Vídeo</b>"
 
 #: ../data/properties.glade.h:45
 msgid "<b>Volume attenuation</b>"
-msgstr ""
+msgstr "<b>Atenuação do volume</b>"
 
 #: ../data/properties.glade.h:46
 msgid "<b>X11 options</b>"
-msgstr ""
+msgstr "<b>Opções de X11</b>"
 
 #: ../data/properties.glade.h:47
 msgid "<b>Xinput joystick</b>"
-msgstr ""
+msgstr "<b>Xinput joystick</b>"
 
 #: ../data/properties.glade.h:48
 msgid "<b>Xinput trackball</b>"
-msgstr ""
+msgstr "<b>Xinput trackball</b>"
 
 #: ../data/properties.glade.h:49
 msgid "<b>Year:</b>"
-msgstr ""
+msgstr "<b>Ano:</b>"
 
 #: ../data/properties.glade.h:50
 msgid "<b>aRts options</b>"
-msgstr ""
+msgstr "<b>Opções de aRts</b>"
 
 #: ../data/properties.glade.h:51
 msgid "Alphablending"
-msgstr ""
+msgstr "Alphablending"
 
 #: ../data/properties.glade.h:52
 msgid "Analog joystick"
-msgstr ""
+msgstr "Joystick Analógico"
 
 #: ../data/properties.glade.h:53
 msgid "Antialiasing"
-msgstr ""
+msgstr "Antialiasing"
 
 #: ../data/properties.glade.h:54
-#, fuzzy
 msgid "Artwork resolution:"
-msgstr "Forçar resoluções"
+msgstr "Resoluções de artwork:"
 
 #: ../data/properties.glade.h:55
-#, fuzzy
 msgid "Audio device:"
-msgstr "Auditoria feita"
+msgstr "Dispositivo de áudio:"
 
 #: ../data/properties.glade.h:56
-#, fuzzy
 msgid "Auto Resolution"
-msgstr "Forçar resoluções"
+msgstr "Resolução automática"
 
 #: ../data/properties.glade.h:57
-#, fuzzy
 msgid "Autodouble"
-msgstr "Auditoria feita"
+msgstr "Autodouble"
 
 #: ../data/properties.glade.h:58
-#, fuzzy
 msgid "Automatic"
-msgstr "Auto"
+msgstr "Automático"
 
 #: ../data/properties.glade.h:59
 msgid "Backdrops"
-msgstr ""
+msgstr "Backdrops"
 
 #: ../data/properties.glade.h:60
-#, fuzzy
 msgid "Beam size"
-msgstr "Tamanho do Buffer %s"
+msgstr "Tamanho do feixe"
 
 #: ../data/properties.glade.h:61
 msgid "Bezels"
-msgstr ""
+msgstr "Bezels"
 
 #: ../data/properties.glade.h:62
 msgid "Bilinear filtering"
-msgstr ""
+msgstr "Filtro bilinear"
 
 #: ../data/properties.glade.h:63
 msgid "Bit per pixels:"
-msgstr ""
+msgstr "Bit por pixels:"
 
 #: ../data/properties.glade.h:64
 msgid "Brightness correction"
-msgstr ""
+msgstr "Correção de brilho"
 
 #: ../data/properties.glade.h:65
 msgid "Cabinet model:"
-msgstr ""
+msgstr "Modelo de Gabinete:"
 
 #: ../data/properties.glade.h:66
 msgid "Card ID:"
-msgstr ""
+msgstr "ID do Cartão:"
 
 #: ../data/properties.glade.h:67
 msgid "Color modulation"
-msgstr ""
+msgstr "Modulação de cor"
 
 #: ../data/properties.glade.h:68
-#, fuzzy
 msgid "Controller:"
-msgstr "Controles"
+msgstr "Controle:"
 
 #: ../data/properties.glade.h:70
 msgid "DSP Plugin:"
-msgstr ""
+msgstr "DSP Plugin:"
 
 #: ../data/properties.glade.h:71
 msgid "Debug windows (for developers)"
-msgstr ""
+msgstr "Janelas de debug (para programadores)"
 
 #: ../data/properties.glade.h:73
 msgid "Device #:"
-msgstr ""
+msgstr "Dispositivo num.:"
 
 #: ../data/properties.glade.h:74
 msgid "Disable mode:"
-msgstr ""
+msgstr "Modo Disabilitado:"
 
 #: ../data/properties.glade.h:76
 msgid "Do not apply rotation"
-msgstr ""
+msgstr "Não aplicar rotação"
 
 #: ../data/properties.glade.h:77
 msgid "Double Buffering"
-msgstr ""
+msgstr "Duplo buffering"
 
 #: ../data/properties.glade.h:78
 msgid "Double buffering"
-msgstr ""
+msgstr "Duplo buffering"
 
 #: ../data/properties.glade.h:79
 msgid "Draw antialiased vectors"
-msgstr ""
+msgstr "Desenhar vetores antialiased"
 
 #: ../data/properties.glade.h:80
 msgid "Draw bitmap"
-msgstr ""
+msgstr "Desenhar bitmap"
 
 #: ../data/properties.glade.h:81
 msgid "Draw only changes"
-msgstr ""
+msgstr "Desenhar somente as mudanças"
 
 #: ../data/properties.glade.h:82
 msgid "Draw translucent vectors"
-msgstr ""
+msgstr "Desenhar vetores translúcidos"
 
 #: ../data/properties.glade.h:83
 msgid "Effect to use:"
-msgstr ""
+msgstr "Efeito para usar:"
 
 #: ../data/properties.glade.h:84
 msgid "Enable Windows keys"
-msgstr ""
+msgstr "Habilitar teclas do Windows"
 
 #: ../data/properties.glade.h:85
 msgid "Enable game cheats"
-msgstr ""
+msgstr "Habilitar trapaças de jogos"
 
 #: ../data/properties.glade.h:87
-#, fuzzy
 msgid "Fake sound"
-msgstr "(som)"
+msgstr "Pseudo som"
 
 #: ../data/properties.glade.h:88
 msgid "File:"
-msgstr ""
+msgstr "Arquivo:"
 
 #: ../data/properties.glade.h:89
 msgid "Flicker"
-msgstr ""
+msgstr "Flicker"
 
 #: ../data/properties.glade.h:90
 msgid "Flip screen left-right"
-msgstr ""
+msgstr "Girar tela da esquerda para direita"
 
 #: ../data/properties.glade.h:91
 msgid "Flip screen upside-down"
-msgstr ""
+msgstr "Girar tela de cima para baixo"
 
 #: ../data/properties.glade.h:92
 msgid "Force YUV mode:"
-msgstr ""
+msgstr "Forçar modo YUV:"
 
 #: ../data/properties.glade.h:94
 msgid "Full Screen"
-msgstr ""
+msgstr "Tela cheia"
 
 #: ../data/properties.glade.h:95
 msgid "Fullscreen"
-msgstr ""
+msgstr "Tela cheia"
 
 #: ../data/properties.glade.h:96
 msgid "GL extension #78"
-msgstr ""
+msgstr "Extensão GL #78"
 
 #: ../data/properties.glade.h:97
 msgid "GLU library:"
-msgstr ""
+msgstr "Biblioteca GLU:"
 
 #: ../data/properties.glade.h:98
 msgid "Gamma correction"
-msgstr ""
+msgstr "Correção de Gamma"
 
 #: ../data/properties.glade.h:99
 msgid "General"
-msgstr ""
+msgstr "Geral"
 
 #: ../data/properties.glade.h:100
 msgid "Geometry:"
-msgstr ""
+msgstr "Geometria:"
 
 #: ../data/properties.glade.h:101
 msgid "Grab keyboard"
-msgstr ""
+msgstr "Trava Teclado"
 
 #: ../data/properties.glade.h:102
 msgid "Grab mouse"
-msgstr ""
+msgstr "Trava mouse"
 
 #: ../data/properties.glade.h:103
 msgid "Height scale:"
-msgstr ""
+msgstr "Escala de Altura:"
 
 #: ../data/properties.glade.h:104
 msgid "HotRod SE support"
-msgstr ""
+msgstr "Suporte a HotRod SE"
 
 #: ../data/properties.glade.h:105
 msgid "HotRod support"
-msgstr ""
+msgstr "Suporte a HodRod"
 
 #: ../data/properties.glade.h:106
 msgid "Intensity"
-msgstr ""
+msgstr "Intensidade"
 
 #: ../data/properties.glade.h:107
 msgid "Joystick device prefix:"
-msgstr ""
+msgstr "Prefixo do dispositivo de Jostick"
 
 #: ../data/properties.glade.h:108
 msgid "Joystick type:"
-msgstr ""
+msgstr "Joystick tipo:"
 
 #: ../data/properties.glade.h:110
 msgid "Keep aspect ratio:"
-msgstr ""
+msgstr "Manter a relação de aspecto:"
 
 #: ../data/properties.glade.h:111
 msgid "Keyboard Layout type:"
-msgstr ""
+msgstr "Tipo de Teclado:"
 
 #: ../data/properties.glade.h:112
 msgid "Log debug info"
-msgstr ""
+msgstr "Informações de debug"
 
 #: ../data/properties.glade.h:113
 msgid "Max frameskip:"
-msgstr ""
+msgstr "Max frameskip:"
 
 #: ../data/properties.glade.h:114
 msgid "Method:"
-msgstr ""
+msgstr "Método:"
 
 #: ../data/properties.glade.h:116
 msgid "Mixer device:"
-msgstr ""
+msgstr "Dispositivo de Mixer:"
 
 #: ../data/properties.glade.h:117
 msgid "Mixer plugin:"
-msgstr ""
+msgstr "Mixer plugin:"
 
 #: ../data/properties.glade.h:118
 msgid ""
 "Name of pad device:\n"
 "(FM townpad)"
 msgstr ""
+"Namo do dispositivo de pad:\n"
+"(FM townpad)"
 
 #: ../data/properties.glade.h:120
 msgid "Neo-Geo Bios:"
-msgstr ""
+msgstr "Neo-Geo Bios:"
 
 #: ../data/properties.glade.h:121
 msgid "OpenGL library:"
-msgstr ""
+msgstr "Biblioteca OpenGL:"
 
 #: ../data/properties.glade.h:122
 msgid "Overlays"
-msgstr ""
+msgstr "Overlays"
 
 #: ../data/properties.glade.h:123
 msgid "PCM:"
-msgstr ""
+msgstr "PCM:"
 
 #: ../data/properties.glade.h:124
-#, fuzzy
 msgid "Private colormap"
-msgstr "Cores do Driver"
+msgstr "Colormap privado"
 
 #: ../data/properties.glade.h:125
 msgid "Rapid-fire"
-msgstr ""
+msgstr "Tiro-Rápido"
 
 #: ../data/properties.glade.h:127
-#, fuzzy
 msgid "Resolution"
-msgstr "Forçar resoluções"
+msgstr "Resolução"
 
 #: ../data/properties.glade.h:128
-#, fuzzy
 msgid "Resolution:"
-msgstr "Forçar resoluções"
+msgstr "Resolução"
 
 #: ../data/properties.glade.h:129
 msgid "SDL modes:"
-msgstr ""
+msgstr "SDL modos:"
 
 #: ../data/properties.glade.h:130
-#, fuzzy
 msgid "Sample rate:"
-msgstr "Amostras"
+msgstr "Taxa de amostragem:"
 
 #: ../data/properties.glade.h:131
 msgid "Scale video to height:"
-msgstr ""
+msgstr "Escala de vídeo para a altura:"
 
 #: ../data/properties.glade.h:132
-#, fuzzy
 msgid "Show cursor"
-msgstr "Mostrar Pastas"
+msgstr "Exibir cursor"
 
 #: ../data/properties.glade.h:133
 msgid "Skip disclaimer info"
-msgstr ""
+msgstr "Saltar informação negada"
 
 #: ../data/properties.glade.h:134
 msgid "Skip game info"
-msgstr ""
+msgstr "Saltar informação do jogo"
 
 #: ../data/properties.glade.h:135
 msgid "Sleep when idle"
-msgstr ""
+msgstr "Durma quando ocioso"
 
 #: ../data/properties.glade.h:137
 msgid "Sound file name:"
-msgstr ""
+msgstr "Nome do Arquivo de Som:"
 
 #: ../data/properties.glade.h:138
 msgid "Texture size:"
-msgstr ""
+msgstr "Tamanho da Textura:"
 
 #: ../data/properties.glade.h:140
 msgid "Timer based audio"
-msgstr ""
+msgstr "Áudio baseado em Temporizador"
 
 #: ../data/properties.glade.h:141
 msgid "True color blitter"
-msgstr ""
+msgstr "True color blitter"
 
 #: ../data/properties.glade.h:142
 msgid "UGCI (tm) Coin/Play support"
-msgstr ""
+msgstr "UGCI (tm) Moedeiro"
 
 #: ../data/properties.glade.h:143
 msgid "USB PS Game Pads"
-msgstr ""
+msgstr "USB PS Game Pads"
 
 #: ../data/properties.glade.h:144
 msgid "Use MIT shared memory"
-msgstr ""
+msgstr "Use MIT memória compartilhada"
 
 #: ../data/properties.glade.h:145
 msgid "Use Scanlines"
-msgstr ""
+msgstr "Usar Scanlines"
 
 #: ../data/properties.glade.h:146
 msgid "Use additional game artwork:"
-msgstr ""
+msgstr "Utilização adicional artwork do jogo:"
 
 #: ../data/properties.glade.h:147
 msgid "Use additional options:"
-msgstr ""
+msgstr "Utilizar opções adicionais:"
 
 #: ../data/properties.glade.h:148
 msgid "Use config name:"
-msgstr ""
+msgstr "Usar nome de configuração:"
 
 #: ../data/properties.glade.h:149
-#, fuzzy
 msgid "Use fixed resolution:"
-msgstr "Forçar resoluções"
+msgstr "Usar resolução fixa:"
 
 #: ../data/properties.glade.h:150
 msgid "Use keyboard LEDs as game indicators"
-msgstr ""
+msgstr "Usar LED de teclado como indicador do jogo"
 
 #: ../data/properties.glade.h:151
 msgid "Use mouse"
-msgstr ""
+msgstr "Usar mouse"
 
 #: ../data/properties.glade.h:152
 msgid "Use preferred device"
-msgstr ""
+msgstr "Utilizar dispositivo preferencial"
 
 #: ../data/properties.glade.h:153
-#, fuzzy
 msgid "Use samples"
-msgstr "Amostras"
+msgstr "Usar amostras"
 
 #: ../data/properties.glade.h:156
 msgid "Width scale:"
-msgstr ""
+msgstr "Largura da tabela:"
 
 #: ../data/properties.glade.h:157
 msgid "Window size:"
-msgstr ""
+msgstr "Tamanho da Janela:"
 
 #: ../data/properties.glade.h:158
 msgid "X Synch"
-msgstr ""
+msgstr "X Synch"
 
 #: ../data/properties.glade.h:159
 msgid "X-based device:"
-msgstr ""
+msgstr "X-based device:"
 
 #: ../data/properties.glade.h:160
 msgid "XIL multi-threading"
-msgstr ""
+msgstr "XIL multi-threading"
 
 #: ../data/properties.glade.h:161
 msgid "XIL scaling"
-msgstr ""
+msgstr "XIL scaling"
 
 #: ../data/properties.glade.h:162
 msgid "aRts buffer delay time:"
-msgstr ""
+msgstr "aRts buffer tempo de demora:"
 
 #: ../data/properties.glade.h:164
-#, fuzzy
 msgid "frames"
-msgstr "jogos"
+msgstr "frames"
 
 #: ../data/rom_info.glade.h:1
 msgid "<b>About this ROM</b>"
-msgstr ""
+msgstr "<b>Sobre esta ROM</b>"
 
 #: ../data/rom_info.glade.h:2
 msgid "<b>Audit Details</b>"
-msgstr ""
+msgstr "<b>Detalhes de Auditoria</b>"
 
 #: ../data/rom_info.glade.h:3
 msgid "<b>Screen Details</b>"
-msgstr ""
+msgstr "<b>Detalhes de Tela</b>"
 
 #: ../data/rom_info.glade.h:4
 msgid "<b>Technical Details</b>"
-msgstr ""
+msgstr "<b>Detalhes Técnicos</b>"
 
 #: ../data/rom_info.glade.h:5
 msgid "CPU:"
-msgstr ""
+msgstr "CPU:"
 
 #: ../data/rom_info.glade.h:6
-#, fuzzy
 msgid "Clone of:"
-msgstr "Clone de"
+msgstr "Clone de:"
 
 #: ../data/rom_info.glade.h:7
-#, fuzzy
 msgid "Colors:"
-msgstr "%i cores"
+msgstr "Cores:"
 
 #: ../data/rom_info.glade.h:9
-#, fuzzy
 msgid "Manufacturer:"
-msgstr "Fabricante"
+msgstr "Fabricante:"
 
 #: ../data/rom_info.glade.h:10
 msgid "Rom check:"
-msgstr ""
+msgstr "Verificação de Rom:"
 
 #: ../data/rom_info.glade.h:11
-#, fuzzy
 msgid "Sample Check:"
-msgstr "Amostras"
+msgstr "Verificar amostras:"
 
 #: ../data/rom_info.glade.h:12
 msgid "Screen:"
-msgstr ""
+msgstr "Tela:"
 
 #: ../data/rom_info.glade.h:13
-#, fuzzy
 msgid "Sound:"
-msgstr "Som"
+msgstr "Som:"
 
 #: ../data/rom_info.glade.h:14
-#, fuzzy
 msgid "Year:"
-msgstr "Ano"
+msgstr "Ano:"
 
 #: ../data/sidebar.glade.h:1
-#, fuzzy
 msgid "Cabinet"
-msgstr "Cliente"
+msgstr "Gabinete"
 
 #: ../data/sidebar.glade.h:2
-#, fuzzy
 msgid "Control Panel"
-msgstr "Controles"
+msgstr "Painel de Controle"
 
 #: ../data/sidebar.glade.h:3
-#, fuzzy
 msgid "Flyer"
-msgstr "Jogadores"
+msgstr "Flyer"
 
 #: ../data/sidebar.glade.h:4
 msgid "Marquee"
-msgstr ""
+msgstr "Marquee"
 
 #: ../data/sidebar.glade.h:5
 msgid "Snapshot"
-msgstr ""
+msgstr "Snapshot"
 
 #: ../data/sidebar.glade.h:6
 msgid "Title Snapshot"
-msgstr ""
+msgstr "Title Snapshot"
 
 #: ../gmameui.desktop.in.h:1
 msgid "Arcade Machine Emulator Frontend"
@@ -2680,19 +2673,14 @@ msgstr "Jogar e escolher jogos clássicos de fliperama"
 #~ "Polonês (pl) - Dawid Cierniak <cierny at poczta.fm>\n"
 #~ "Chinês Simplificado (zh_CN) - Andrew Wong <andrew at thizlinux.com>\n"
 #~ "Chinês Tradicional (zh_TW) - Jouston Huang <jouston at jouston.no-ip.com>\n"
-
 #~ msgid "Text"
 #~ msgstr "Texto"
-
 #~ msgid "Text to render"
 #~ msgstr "Texto a renderizar"
-
 #~ msgid "Pixbuf Object"
 #~ msgstr "Objeto Pixbuf"
-
 #~ msgid "The pixbuf to render."
 #~ msgstr "O pixbuf a renderizar."
-
 #~ msgid ""
 #~ "Current Folder may not exist after loading the new catver file.\n"
 #~ "Moving to the \"Available\" game folder"
@@ -2700,27 +2688,20 @@ msgstr "Jogar e escolher jogos clássicos de fliperama"
 #~ "Pasta Corrente pode não mais existir depois de carregar o novo arquivo "
 #~ "catver.\n"
 #~ "Movendo para a pasta do jogo \"Disponível\""
-
 #~ msgid "dirs.ini not loaded, using default values"
 #~ msgstr "dirs.ini não carregado, usando valores padrões"
-
 #~ msgid "unable to load gmameui.ini, using default values"
 #~ msgstr "impossível carregar gmameui.ini, usando valores padrões"
-
 #~ msgid "Time to create gamelist: %.02f seconds"
 #~ msgstr "Tempo para criar lista de jogos: %.02f segundos"
-
 #~ msgid "Time to create gamelist content: %.02f seconds"
 #~ msgstr "Tempo para criar conteúdo da lista de jogos: %.02f segundos"
-
 #~ msgid "Game search %i%% complete"
 #~ msgstr "Procura por jogo %i%% completa"
-
 #~ msgid "Working"
 #~ msgstr "Funcionando"
-
 #~ msgid "Not Working"
 #~ msgstr "Não funciona"
-
 #~ msgid "Choose inp file to record"
 #~ msgstr "Escolha um arquivo inp para gravar"
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d2aaa1..9597589 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ gmameui_SOURCES = \
 	gtkjoy.c gtkjoy.h \
 	gui_prefs.c gui_prefs.h \
 	gui_prefs_dialog.c gui_prefs_dialog.h \
-	unzip.c unzip.h \
+	gmameui-zip-utils.c gmameui-zip-utils.h \
 	keyboard.c keyboard.h \
 	xmame_options.h xmame_options.c \
 	mame-exec.h mame-exec.c \
@@ -54,9 +54,10 @@ gmameui-marshaller.c: gmameui-marshallers.list
 	echo "#include \"gmameui-marshaller.h\"" > $@ && \
 	glib-genmarshal --prefix=gmameui_marshaller --body $< >> $@
 
-gmameui_LDADD = @GTK_LIBS@ $(GLADE2_LIBS) $(GNOME_LIBS) $(INTLLIBS) 
+gmameui_LDADD = @GTK_LIBS@ $(GLADE2_LIBS) $(GNOME_LIBS) $(ARCHIVE_LIBS) $(INTLLIBS) 
 
 AM_CPPFLAGS = -g -Wall $(GTK_CFLAGS) $(GLADE2_CFLAGS) $(GNOME_CFLAGS) \
+		-I$(top_srcdir)/include \
 		-DDATADIR=\""$(datadir)"\" \
 		-DGLADEDIR=\"${datadir}/gmameui/glade/\" \
 		-DGMAMEUI_UI_DIR=\"${datadir}/gmameui/ui/\" \
diff --git a/src/Makefile.in b/src/Makefile.in
index 55a24fc..0d10374 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -66,8 +66,8 @@ am_gmameui_OBJECTS = common.$(OBJEXT) gmameui.$(OBJEXT) \
 	gmameui-audit-dlg.$(OBJEXT) gmameui-rominfo-dlg.$(OBJEXT) \
 	gmameui-search-entry.$(OBJEXT) options_string.$(OBJEXT) \
 	gtkjoy.$(OBJEXT) gui_prefs.$(OBJEXT) \
-	gui_prefs_dialog.$(OBJEXT) unzip.$(OBJEXT) keyboard.$(OBJEXT) \
-	xmame_options.$(OBJEXT) mame-exec.$(OBJEXT) \
+	gui_prefs_dialog.$(OBJEXT) gmameui-zip-utils.$(OBJEXT) \
+	keyboard.$(OBJEXT) xmame_options.$(OBJEXT) mame-exec.$(OBJEXT) \
 	mame-exec-list.$(OBJEXT) mame_options.$(OBJEXT) \
 	mame_options_dialog.$(OBJEXT) mame_options_legacy.$(OBJEXT) \
 	mame_options_legacy_dialog.$(OBJEXT) \
@@ -77,7 +77,7 @@ am_gmameui_OBJECTS = common.$(OBJEXT) gmameui.$(OBJEXT) \
 gmameui_OBJECTS = $(am_gmameui_OBJECTS)
 am__DEPENDENCIES_1 =
 gmameui_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -102,6 +102,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+ARCHIVE_LIBS = @ARCHIVE_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -261,7 +262,7 @@ gmameui_SOURCES = \
 	gtkjoy.c gtkjoy.h \
 	gui_prefs.c gui_prefs.h \
 	gui_prefs_dialog.c gui_prefs_dialog.h \
-	unzip.c unzip.h \
+	gmameui-zip-utils.c gmameui-zip-utils.h \
 	keyboard.c keyboard.h \
 	xmame_options.h xmame_options.c \
 	mame-exec.h mame-exec.c \
@@ -280,8 +281,9 @@ REDUNDANT_FILES = \
 	network_game.h network_game.c \
 	game_options.h game_options.c 
 
-gmameui_LDADD = @GTK_LIBS@ $(GLADE2_LIBS) $(GNOME_LIBS) $(INTLLIBS) 
+gmameui_LDADD = @GTK_LIBS@ $(GLADE2_LIBS) $(GNOME_LIBS) $(ARCHIVE_LIBS) $(INTLLIBS) 
 AM_CPPFLAGS = -g -Wall $(GTK_CFLAGS) $(GLADE2_CFLAGS) $(GNOME_CFLAGS) \
+		-I$(top_srcdir)/include \
 		-DDATADIR=\""$(datadir)"\" \
 		-DGLADEDIR=\"${datadir}/gmameui/glade/\" \
 		-DGMAMEUI_UI_DIR=\"${datadir}/gmameui/ui/\" \
@@ -373,6 +375,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmameui-rominfo-dlg.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmameui-search-entry.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmameui-sidebar.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmameui-zip-utils.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmameui.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gossip-cell-renderer-expander.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkjoy.Po at am__quote@
@@ -392,7 +395,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/options_string.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/progression_window.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rom_entry.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unzip.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmame_options.Po at am__quote@
 
 .c.o:
diff --git a/src/about.c b/src/about.c
index 0430778..c8f902b 100644
--- a/src/about.c
+++ b/src/about.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -135,7 +134,8 @@ create_CreditsWindow (GtkWindow *parent)
 	translators = gtk_label_new(_("The following people translated GMAMEUI:\n"
 				      "Brazilian Portugese (pt_BR) - Alfredo Jr <junix at linuxinabox.org>\n"
 				      "Italian (it) - Ugo Viti <ugo.viti at initzero.it>\n"
-				      "Swedish (sv) - Daniel Nylander <dnylander at users.sourceforge.net>\n"));
+				      "Swedish (sv) - Daniel Nylander <dnylander at users.sourceforge.net>\n"
+				      "French (fr) - Loïc Martin <loic.martin3 at gmail.com>"));
 	gtk_widget_show (translators);
 	gtk_notebook_append_page (credits_notebook, translators, translators_label);
 
diff --git a/src/about.h b/src/about.h
index 0b99074..3dd142f 100644
--- a/src/about.h
+++ b/src/about.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/audit.c b/src/audit.c
index e63efa5..0d2dc2f 100644
--- a/src/audit.c
+++ b/src/audit.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/audit.h b/src/audit.h
index f57466d..b42f322 100644
--- a/src/audit.h
+++ b/src/audit.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/callbacks.c b/src/callbacks.c
index 9aa87c3..66c71f6 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/callbacks.h b/src/callbacks.h
index 02c1e2c..9835deb 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/cell-renderer-captioned-image.c b/src/cell-renderer-captioned-image.c
index 79a67bd..df69b4b 100644
--- a/src/cell-renderer-captioned-image.c
+++ b/src/cell-renderer-captioned-image.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/cell-renderer-captioned-image.h b/src/cell-renderer-captioned-image.h
index f861c6f..940f5e4 100644
--- a/src/cell-renderer-captioned-image.h
+++ b/src/cell-renderer-captioned-image.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/common.c b/src/common.c
index c02962c..f972e61 100644
--- a/src/common.c
+++ b/src/common.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/common.h b/src/common.h
index 419218a..bdf61ba 100644
--- a/src/common.h
+++ b/src/common.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/directories.c b/src/directories.c
index 85b78e8..6033c09 100644
--- a/src/directories.c
+++ b/src/directories.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/directories.h b/src/directories.h
index 1cbbaa1..5d37b21 100644
--- a/src/directories.h
+++ b/src/directories.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/filter.c b/src/filter.c
index 29e65d8..6983f77 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -1,3 +1,23 @@
+/*
+ * GMAMEUI
+ *
+ * Copyright 2008-2009 Andrew Burton <adb at iinet.net.au>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
 #include "filter.h"
 #include "gmameui.h"
 
diff --git a/src/filter.h b/src/filter.h
index 690dc70..f1804e0 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -1,3 +1,23 @@
+/*
+ * GMAMEUI
+ *
+ * Copyright 2008-2009 Andrew Burton <adb at iinet.net.au>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
 #ifndef __FILTER_H
 #define __FILTER_H
 
diff --git a/src/filters_list.c b/src/filters_list.c
index 705829e..1c87ddd 100644
--- a/src/filters_list.c
+++ b/src/filters_list.c
@@ -6,7 +6,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/filters_list.h b/src/filters_list.h
index e0786ef..06f2045 100644
--- a/src/filters_list.h
+++ b/src/filters_list.h
@@ -5,7 +5,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/game_list.c b/src/game_list.c
index c7e4142..1a80bde 100644
--- a/src/game_list.c
+++ b/src/game_list.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,11 +17,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
+#include "common.h"
+
 #include <string.h>
 #include <stdlib.h>
 
@@ -101,7 +102,6 @@ mame_gamelist_class_init (MameGamelistClass *klass)
 static void
 mame_gamelist_init (MameGamelist *gl)
 {
-	int i;
 GMAMEUI_DEBUG ("Creating mame_gamelist object");	
 	gl->priv = g_new0 (MameGamelistPrivate, 1);
 	
@@ -342,13 +342,14 @@ gboolean mame_gamelist_load (MameGamelist *gl)
 	g_message (_("Loading gamelist %s"), filename);
 	
 	gamelist = fopen (filename, "r");
-	g_free (filename);
 
 	if (!gamelist) {
 		GMAMEUI_DEBUG ("Could not open gamelist file %s", filename);
 		gl->priv->version = g_strdup ("unknown");
 		return FALSE;
 	}
+
+	g_free (filename);
 	
 	while (fgets (line, LINE_BUF, gamelist)) {
 		p = line;
diff --git a/src/game_list.h b/src/game_list.h
index ed6e730..04a1af5 100644
--- a/src/game_list.h
+++ b/src/game_list.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/game_options.c b/src/game_options.c
index 7ff49d0..6be256a 100644
--- a/src/game_options.c
+++ b/src/game_options.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 #ifdef DELETE
diff --git a/src/game_options.h b/src/game_options.h
index b3e9da6..131c671 100644
--- a/src/game_options.h
+++ b/src/game_options.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/gmameui-audit-dlg.c b/src/gmameui-audit-dlg.c
index 8b1f3bd..5b11dec 100644
--- a/src/gmameui-audit-dlg.c
+++ b/src/gmameui-audit-dlg.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/gmameui-audit-dlg.h b/src/gmameui-audit-dlg.h
index c126acd..acbaa97 100644
--- a/src/gmameui-audit-dlg.h
+++ b/src/gmameui-audit-dlg.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/gmameui-gamelist-view.c b/src/gmameui-gamelist-view.c
index 28d3492..245992b 100644
--- a/src/gmameui-gamelist-view.c
+++ b/src/gmameui-gamelist-view.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,11 +17,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
+#include "common.h"
+
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 
@@ -119,6 +120,8 @@ static void
 on_prefs_column_shown_toggled (MameGuiPrefs *prefs, gpointer va, gpointer user_data);
 static void
 on_prefs_theprefix_toggled    (MameGuiPrefs *prefs, gboolean theprefix, gpointer user_data);
+static void
+on_prefs_prefercustomicons_toggled  (MameGuiPrefs *prefs, gboolean customicons, gpointer user_data);
 
 /* Callbacks handling when the Search Entry text changes */
 static void
@@ -361,6 +364,8 @@ mame_gamelist_view_init (MameGamelistView *gamelist_view)
 	/* Callback handling on MameGuiPrefs changes */
 	g_signal_connect (G_OBJECT (main_gui.gui_prefs), "col-toggled",
 			  G_CALLBACK (on_prefs_column_shown_toggled), gamelist_view);
+	g_signal_connect (G_OBJECT (main_gui.gui_prefs), "prefercustomicons-toggled",
+			  G_CALLBACK (on_prefs_prefercustomicons_toggled), gamelist_view);
 	g_signal_connect (G_OBJECT (main_gui.gui_prefs), "theprefix-toggled",
 			  G_CALLBACK (on_prefs_theprefix_toggled), gamelist_view);
 
@@ -559,14 +564,21 @@ mame_gamelist_view_update_game_in_list (MameGamelistView *gamelist_view, MameRom
 	PangoStyle pangostyle;
 	const gchar *name_in_list;
 	GtkTreeIter iter;
-
+	gchar *iconzipfile;
+	gchar *icondir;
+	gboolean prefercustomicons;
+	
 	g_return_if_fail (tmprom != NULL);
 
 	g_object_get (main_gui.gui_prefs,
 		      "current-mode", &current_mode,
-		      "current-rom-filter", &rom_filter_opt,
+		      "current-rom-filter", &rom_filter_opt,	      
+		      "dir-icons", &icondir,
+		      "prefercustomicons", &prefercustomicons,
 		      NULL);
 	
+	iconzipfile = g_build_filename (icondir, "icons.zip", NULL);
+	
 #ifdef TREESTORE	
 	/* Whether the Tree Model will a tree or a list */
 	is_tree_store = (current_mode == LIST_TREE) || (current_mode == DETAILS_TREE);
@@ -605,7 +617,7 @@ mame_gamelist_view_update_game_in_list (MameGamelistView *gamelist_view, MameRom
 		      NULL);
 	
 	/* Set the pixbuf for the status icon */
-	pixbuf = Status_Icons [mame_rom_entry_get_rom_status (tmprom)];
+	pixbuf = get_icon_for_rom (tmprom, ROM_ICON_SIZE, icondir, iconzipfile, prefercustomicons);
 	
 	iter = mame_rom_entry_get_position (tmprom);
 
@@ -648,7 +660,7 @@ mame_gamelist_view_update_game_in_list (MameGamelistView *gamelist_view, MameRom
 #ifdef TREESTORE
 	}
 #endif
-	
+
 	g_free (romname);
 	g_free (manu);
 	g_free (year);
@@ -656,6 +668,10 @@ mame_gamelist_view_update_game_in_list (MameGamelistView *gamelist_view, MameRom
 	g_free (driver);
 	g_free (category);
 	g_free (version);
+	
+	g_free (iconzipfile);
+	g_free (icondir);
+
 }
 
 static void
@@ -947,10 +963,10 @@ on_expand_all_activate (GtkMenuItem *menuitem,
 static gboolean
 delayed_row_selected (GtkTreeSelection *selection)
 {
-	MameRomEntry *rom;
+	MameRomEntry *rom = NULL;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
-	
+
 	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		gtk_tree_model_get (model, &iter, ROMENTRY, &rom, -1);
 
@@ -958,9 +974,9 @@ delayed_row_selected (GtkTreeSelection *selection)
 
 		g_object_set (main_gui.gui_prefs, "current-rom", mame_rom_entry_get_romname (rom), NULL);
 
-		select_game (rom);
+//		select_game (rom);
 	}
-	
+select_game (rom);
 	return FALSE;
 }
 
@@ -1109,7 +1125,7 @@ foreach_update_prefix_in_store (GtkTreeModel *model,
 #endif
 	return FALSE;   /* Do not stop walking the store, call us with next row */
 }
-	
+
 /* Handler for when the columns in the GuiPrefs object are changed (usually via
    the GUI Preferences dialog */
 static void
@@ -1147,6 +1163,26 @@ on_prefs_column_shown_toggled (MameGuiPrefs *prefs, gpointer va_cols, gpointer u
 	g_list_free (column_list);
 }
 
+/* Handler for when 'Prefer custom icons' in the GuiPrefs object is changed
+   (usually via the GUI Preferences dialog). If turned on, want to use
+   custom icons for non-correct ROMs. Trigger this by invoking
+   adjustment_scrolled_delayed which updates the icons appropriately. This is
+   done in a g_timeout_add clause to prevent blocking the UI */
+static void
+on_prefs_prefercustomicons_toggled (MameGuiPrefs *prefs, gboolean prefercustomicons, gpointer user_data)
+{
+
+	MameGamelistView *gamelist_view;
+	
+	gamelist_view = (gpointer) user_data;
+
+	/* Call adjustment_scrolled_delayed which updates the icons in the
+	   visible range of the gamelist */
+	g_timeout_add (ICON_TIMEOUT,
+		       (GSourceFunc) adjustment_scrolled_delayed, gamelist_view);
+
+}
+
 /* Handler for when the 'The' prefix in the GuiPrefs object is changed
    (usually via the GUI Preferences dialog) */
 static void
@@ -1390,7 +1426,9 @@ populate_model_from_gamelist (MameGamelistView *gamelist_view, GtkTreeModel *mod
 {
 	GList *listpointer;
 	MameRomEntry *tmprom;
+#ifdef TREESTORE
 	gchar *my_romname_root = NULL;
+#endif
 	gchar *my_hassamples;
 	GtkTreeIter iter;
 #ifdef TREESTORE
@@ -1433,7 +1471,9 @@ populate_model_from_gamelist (MameGamelistView *gamelist_view, GtkTreeModel *mod
 			pangostyle = PANGO_STYLE_NORMAL;	/* Original */
 		}
 
-		/* Set the pixbuf for the status icon */
+		/* Set the pixbuf for the status icon - start as being the status icon,
+		   then look for the custom icon in the adjustment_scrolled_delayed
+		   callback since we don't want to load icons from zips for EVERY ROM */
 		pixbuf = Status_Icons [mame_rom_entry_get_rom_status (tmprom)];
 
 #ifdef TREESTORE
@@ -1580,17 +1620,18 @@ adjustment_scrolled_delayed (MameGamelistView *gamelist_view)
 #endif
 	GtkTreePath *tree_path;
 	guint i;
-	ZIP *zip;
-	gchar *zipfile;
 	gboolean valid;
 	GtkAdjustment *vadj;
-	gchar *icon_dir;
+	gchar *icondir;
+	gchar *iconzipfile;
+	gboolean prefercustomicons;
 	
 	g_return_val_if_fail (main_gui.gui_prefs != NULL, FALSE);
 	
 GMAMEUI_DEBUG ("Entering adjustment_scrolled_delayed");
 	g_object_get (main_gui.gui_prefs,
-		      "dir-icons", &icon_dir,
+		      "dir-icons", &icondir,
+		      "prefercustomicons", &prefercustomicons,
 #ifdef TREESTORE
 		      "current-mode", &current_mode,
 #endif
@@ -1598,9 +1639,7 @@ GMAMEUI_DEBUG ("Entering adjustment_scrolled_delayed");
 
 	g_return_val_if_fail (visible_games > 0, FALSE);
 	
-	/* Open the zip file only at the begining */
-	zipfile = g_build_filename (icon_dir, "icons.zip", NULL);
-	zip = openzip (zipfile);
+	iconzipfile = g_build_filename (icondir, "icons.zip", NULL);
 
 	/* Getting the vertical window area */
 	vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (main_gui.scrolled_window_games));
@@ -1667,14 +1706,11 @@ GMAMEUI_DEBUG ("Entering adjustment_scrolled_delayed");
 					     tree_path,
 					     NULL, &rect);
 
-		/* Only update the pixbuf if it is in the viewable area
-		   (defined by the rect), the ROM is correct, and the
-		   pixbuf is not already set */
-		if ((rect.y + rect.height) > 0 && (rect.y < vadj->page_size) &&
-		    (mame_rom_entry_get_rom_status (tmprom) == CORRECT) &&
-		    !mame_rom_entry_get_icon (tmprom)) {
+		/* Only update the pixbuf if it is in the viewable area (defined by the rect) */
+		if ((rect.y + rect.height) > 0 && (rect.y < vadj->page_size)) {
 			GdkPixbuf *icon;
-			icon = get_icon_for_rom (tmprom, ROM_ICON_SIZE, zip);
+
+			icon = get_icon_for_rom (tmprom, ROM_ICON_SIZE, icondir, iconzipfile, prefercustomicons);
 
 			mame_rom_entry_set_icon (tmprom, icon);
 			
@@ -1726,11 +1762,8 @@ GMAMEUI_DEBUG ("Entering adjustment_scrolled_delayed");
 					   adjustment_scrolled,
 					   gamelist_view);
 
-	if (zip)
-		closezip (zip);
-	
-	g_free (zipfile);
-	g_free (icon_dir);
+	g_free (iconzipfile);
+	g_free (icondir);
 GMAMEUI_DEBUG ("Leaving adjustment_scrolled_delayed");
 	return FALSE;
 }
diff --git a/src/gmameui-gamelist-view.h b/src/gmameui-gamelist-view.h
index 6ce14b1..f303071 100644
--- a/src/gmameui-gamelist-view.h
+++ b/src/gmameui-gamelist-view.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/gmameui-rominfo-dlg.c b/src/gmameui-rominfo-dlg.c
index cfff6fc..0f77fef 100644
--- a/src/gmameui-rominfo-dlg.c
+++ b/src/gmameui-rominfo-dlg.c
@@ -2,13 +2,13 @@
 /*
  * GMAMEUI
  *
- * Copyright 2007-2008 Andrew Burton <adb at iinet.net.au>
+ * Copyright 2007-2009 Andrew Burton <adb at iinet.net.au>
  * based on GXMame code
  * 2002-2005 Stephane Pontier <shadow_walker at users.sourceforge.net>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,9 +17,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *add_controller_options_tab_new
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 #include "common.h"
@@ -277,7 +276,6 @@ gfloat freq;
 		/* Get the title of the original ROM */
 		title = mame_rom_entry_get_parent_romname (priv->rom);
 		gtk_label_set_text (GTK_LABEL (label), title);
-		g_free (title);
 	} else {
 		gtk_widget_hide (label);
 		gtk_widget_hide (clone_label);
@@ -305,7 +303,7 @@ gfloat freq;
 	priv->details_audit_result_buffer = gtk_text_buffer_new (NULL);
 	priv->details_audit_result = glade_xml_get_widget (priv->xml, "details_audit_result");
 	gtk_text_view_set_buffer (GTK_TEXT_VIEW (priv->details_audit_result), priv->details_audit_result_buffer);
-	
+
 	priv->romset_sigid = g_signal_connect (gui_prefs.audit, "romset-audited",
 					       G_CALLBACK (on_romset_audited), dialog);
 	
diff --git a/src/gmameui-rominfo-dlg.h b/src/gmameui-rominfo-dlg.h
index 8bbb00b..d1ea819 100644
--- a/src/gmameui-rominfo-dlg.h
+++ b/src/gmameui-rominfo-dlg.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
  
diff --git a/src/gmameui-search-entry.c b/src/gmameui-search-entry.c
index cf3f9b1..1a1c546 100644
--- a/src/gmameui-search-entry.c
+++ b/src/gmameui-search-entry.c
@@ -6,7 +6,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 #include <glade/glade.h>
diff --git a/src/gmameui-search-entry.h b/src/gmameui-search-entry.h
index 6a95262..6d78464 100644
--- a/src/gmameui-search-entry.h
+++ b/src/gmameui-search-entry.h
@@ -5,7 +5,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/gmameui-sidebar.c b/src/gmameui-sidebar.c
index b65c8da..0558608 100644
--- a/src/gmameui-sidebar.c
+++ b/src/gmameui-sidebar.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,11 +17,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
+#include "common.h"
+
 #include <string.h>
 #include <glade/glade.h>
 
@@ -29,6 +30,7 @@
 #include "gmameui.h"
 #include "gui.h"
 #include "gui_prefs.h"
+#include "gmameui-zip-utils.h"
 
 static void gmameui_sidebar_class_init (GMAMEUISidebarClass *class);
 static void gmameui_sidebar_init (GMAMEUISidebar *dlg);
@@ -300,79 +302,6 @@ set_game_info (const MameRomEntry *rom,
 	return set_info (entry_name, text_buffer);
 }
 
-/* Get a pixbuf from a zip file for a specified rom. If the pixbuf could not
-   be found, search for a pixbuf for the parent */
-GdkPixbuf *
-get_pixbuf_from_zip_file (ZIP *zip, gchar *romname, gchar *parent_romname)
-{
-	struct zipent* zipent;
-	GdkPixbuf *pixbuf = NULL;
-	gchar *filename;
-	gchar *tmp_buffer;
-	gchar *parent_tmp_buffer = NULL;
-	gsize parent_buf_size = 0;
-	gchar *parent_filename;
-	GError *error = NULL;
-
-	GdkPixbufLoader *loader;
-
-	filename = g_strdup_printf ("%s.", romname);
-	parent_filename = g_strdup_printf ("%s.", parent_romname);
-
-	while ((zipent = readzip (zip)) != 0) {
-		/* this should allows to find any format of picture in the zip, not only bmp */
-		if (!strncmp (filename,zipent->name, strlen (romname) + 1)) {
-			GMAMEUI_DEBUG (_("Found file name %s with CRC: %u, size %i"),
-				       zipent->name,
-				       zipent->crc32,
-				       zipent->uncompressed_size);
-			
-			tmp_buffer = read_zipentry (zip, zipent);
-			
-			if (tmp_buffer) {
-				GMAMEUI_DEBUG (_("Attempting to uncompress %s"), zipent->name);
-				/* if the file successfully uncompress, try to load it in a pixbuf loader */
-				loader = gdk_pixbuf_loader_new ();
-				if (gdk_pixbuf_loader_write (loader, (guchar *)tmp_buffer, (gsize) zipent->uncompressed_size, &error)) {
-					pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-					gdk_pixbuf_loader_close (loader, &error);
-					GMAMEUI_DEBUG (_("Loaded pixbuf"));
-				} else {
-					GMAMEUI_DEBUG (_("Error while uncompressing %s: %s"), zipent->name, error->message);
-					g_error_free (error);
-					error = NULL;
-				}
-				g_free (tmp_buffer);
-				tmp_buffer = NULL;
-			}
-			/* prevent to read all zip file if we have found the picture's game (uncompressed successfuly or not) */
-			break;
-
-		} else if (!strncmp (parent_filename, zipent->name, strlen (parent_romname) + 1)) {
-			parent_tmp_buffer = read_zipentry (zip, zipent);
-			parent_buf_size = zipent->uncompressed_size;
-		}
-	}
-	g_free (filename);
-	g_free (parent_filename);
-
-	/* no picture found try parent game if any*/
-	if (!pixbuf && parent_tmp_buffer) {
-		loader = gdk_pixbuf_loader_new ();
-		if (!gdk_pixbuf_loader_write (loader, (guchar *)parent_tmp_buffer, parent_buf_size, &error)) {
-			GMAMEUI_DEBUG (_("Error while uncompressing %s: %s"), zipent->name, error->message);
-		} else {
-			pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-			gdk_pixbuf_loader_close (loader, &error);
-		}
-	}
-
-	g_free (parent_tmp_buffer);
-					   
-	return pixbuf;
-}
-
-
 /* Returns a GtkWidget representing a GtkImage */
 static GtkWidget *
 get_pixbuf (MameRomEntry       *tmprom,
@@ -475,20 +404,20 @@ get_pixbuf (MameRomEntry       *tmprom,
 	
 	/* we havent found the picture in the directory, maybe we could try in a zipfile */
 	if (!pixbuf) {
-		ZIP *zip;
 		gchar *snapshotdir;
 		g_object_get (main_gui.gui_prefs, "dir-snapshot", &snapshotdir, NULL);
 		zipfile = g_build_filename (snapshotdir, "snap.zip", NULL);
-		zip = openzip (zipfile);
 
-		if (zip) {
-			GMAMEUI_DEBUG ("Looking for image in zip file %s", zipfile);
-			pixbuf = get_pixbuf_from_zip_file (zip,
-							   mame_rom_entry_get_romname (tmprom),
-							   mame_rom_entry_get_parent_romname (tmprom));
-			closezip (zip);
-		} else
-			GMAMEUI_DEBUG (_("Error - cannot open zip file %s"), zipfile);
+		GMAMEUI_DEBUG ("Looking for image in zip file %s", zipfile);
+
+		/* Look in snap.zip; if the snapshot for the ROM can not be found,
+		   look for the parent's snap instead */
+		pixbuf = read_pixbuf_from_zip_file (zipfile,
+						    mame_rom_entry_get_romname (tmprom));
+		if (pixbuf == NULL)
+			pixbuf = read_pixbuf_from_zip_file (zipfile,
+							    mame_rom_entry_get_parent_romname (tmprom));
+
 
 		g_free (zipfile);
 	}
@@ -839,6 +768,8 @@ gmameui_sidebar_set_history (GMAMEUISidebar *sidebar, MameRomEntry *rom)
 void
 gmameui_sidebar_set_current_page (GMAMEUISidebar *sidebar, int page)
 {
+	g_return_if_fail (sidebar != NULL);
+
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (sidebar->priv->screenshot_notebook),
 				       page);
 }
diff --git a/src/gmameui-sidebar.h b/src/gmameui-sidebar.h
index dbd89c1..10b545f 100644
--- a/src/gmameui-sidebar.h
+++ b/src/gmameui-sidebar.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -27,7 +26,6 @@
 #include <gtk/gtk.h>
 //#include "common.h"
 #include "rom_entry.h"
-#include "unzip.h"
 
 /**** Sidebar functionality ****/
 #define GMAMEUI_TYPE_SIDEBAR        (gmameui_sidebar_get_type ())
@@ -63,9 +61,6 @@ GtkWidget *gmameui_sidebar_new (void);
 void gmameui_sidebar_set_with_rom (GMAMEUISidebar *sidebar, MameRomEntry *rom);
 void gmameui_sidebar_set_current_page (GMAMEUISidebar *sidebar, int page);
 
-GdkPixbuf *
-get_pixbuf_from_zip_file (ZIP *zip, gchar *romname, gchar *parent_romname);
-
 /**** End Sidebar functionality ****/
 
 #endif /* __GMAMEUI_SIDEBAR_H__ */
diff --git a/src/gmameui-zip-utils.c b/src/gmameui-zip-utils.c
new file mode 100644
index 0000000..8be9921
--- /dev/null
+++ b/src/gmameui-zip-utils.c
@@ -0,0 +1,110 @@
+/*
+ * GMAMEUI
+ *
+ * Copyright 2009 Andrew Burton <adb at iinet.net.au>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include <archive.h>
+#include <archive_entry.h>
+#include <string.h>
+
+#include "gmameui-zip-utils.h"
+#include "common.h"
+
+static GdkPixbuf *
+load_pixbuf_data (gchar *data, gint size)
+{
+	GdkPixbufLoader *loader;
+	GdkPixbuf *pixbuf;
+	GError *error = NULL;
+	
+	pixbuf = NULL;
+	
+	loader = gdk_pixbuf_loader_new ();
+	
+	if (gdk_pixbuf_loader_write (loader,
+								 (guchar *) data,
+								 (gsize) size,
+								 &error)) {
+		pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+		gdk_pixbuf_loader_close (loader, &error);
+		GMAMEUI_DEBUG (_("Loaded pixbuf"));
+	} else {
+		GMAMEUI_DEBUG ("Error while loading pixbuf data: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
+	
+	return pixbuf;
+}
+
+/* Given a specified zip file and target romname, return the relevant pixbuf */
+GdkPixbuf *
+read_pixbuf_from_zip_file (gchar *zipfilename, gchar *romname)
+{
+	GdkPixbuf *pixbuf;
+	gchar *buffer_data; /* Space to read found pixbuf entry */
+	struct archive *zipfile;
+	struct archive_entry *zipentry;
+	
+	g_return_val_if_fail (zipfilename != NULL, NULL);
+	g_return_val_if_fail (romname != NULL, NULL);
+	
+	zipfile = archive_read_new ();
+	
+	g_return_val_if_fail (zipfile != NULL, NULL);
+
+	archive_read_support_compression_all (zipfile); /* Check that we can support all compression levels */
+	archive_read_support_format_zip (zipfile);  /* Check that we can support zipfiles */
+	
+	if (archive_read_open_file (zipfile, zipfilename, 10240) != ARCHIVE_OK) {
+		GMAMEUI_DEBUG ("Error opening the archive %s", zipfilename);
+		return NULL;
+	}
+
+	pixbuf = NULL;
+	
+	while (archive_read_next_header (zipfile, &zipentry) == ARCHIVE_OK) {
+		gint filesize;  /* Uncompressed size of the file */
+
+		filesize = archive_entry_size (zipentry);
+
+		if (g_ascii_strncasecmp ((gchar *) archive_entry_pathname (zipentry),
+								 romname,
+								 strlen (romname)) == 0) {
+			GMAMEUI_DEBUG ("Found entry in zip file for ROM %s", romname);
+
+			buffer_data = (gchar *) g_malloc0 (filesize);
+			
+			/* Read the zipped pixbuf into memory */
+			archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+			
+			pixbuf = load_pixbuf_data (buffer_data, filesize);
+									 
+			g_free (buffer_data);
+
+			break;  /* Found it - no need to continue processing */
+		}
+	}
+	
+	/* Close and clean up */
+	archive_read_close (zipfile);
+	archive_read_finish (zipfile);
+	
+	return pixbuf;
+	
+}
\ No newline at end of file
diff --git a/src/gmameui-zip-utils.h b/src/gmameui-zip-utils.h
new file mode 100644
index 0000000..3d261ea
--- /dev/null
+++ b/src/gmameui-zip-utils.h
@@ -0,0 +1,30 @@
+/*
+ * GMAMEUI
+ *
+ * Copyright 2009 Andrew Burton <adb at iinet.net.au>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#ifndef __ROM_ENTRY_H__
+#define __ROM_ENTRY_H__
+
+
+GdkPixbuf *
+read_pixbuf_from_zip_file (gchar *zipfilename, gchar *romname);
+
+#endif /* __ROM_ENTRY_H__ */
diff --git a/src/gmameui.c b/src/gmameui.c
index c69682d..651130d 100644
--- a/src/gmameui.c
+++ b/src/gmameui.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -73,7 +72,8 @@ main (int argc, char *argv[])
 	gtk_init (&argc, &argv);
 	
 	gmameui_init ();
-	init_gui ();
+	if (init_gui () == -1)
+return -1;
 
 	/* Load the default options */
 	main_gui.options = mame_options_new ();
diff --git a/src/gmameui.h b/src/gmameui.h
index 527fc43..197c8ea 100644
--- a/src/gmameui.h
+++ b/src/gmameui.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/gossip-cell-renderer-expander.c b/src/gossip-cell-renderer-expander.c
index e116ace..5b81221 100644
--- a/src/gossip-cell-renderer-expander.c
+++ b/src/gossip-cell-renderer-expander.c
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
+ * published by the Free Software Foundation; either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -12,11 +12,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
  * Authors: Kristian Rietveld <kris at imendio.com>
  */
 
diff --git a/src/gossip-cell-renderer-expander.h b/src/gossip-cell-renderer-expander.h
index 7df4746..e1cb308 100644
--- a/src/gossip-cell-renderer-expander.h
+++ b/src/gossip-cell-renderer-expander.h
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
+ * published by the Free Software Foundation; either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -12,11 +12,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
  * Authors: Kristian Rietveld <kris at imendio.com>
  */
 
diff --git a/src/gtkjoy.c b/src/gtkjoy.c
index 4bc22a0..c811873 100644
--- a/src/gtkjoy.c
+++ b/src/gtkjoy.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  * Code based on:
  * gtkjoy.c - general routines for handling joystick events
diff --git a/src/gtkjoy.h b/src/gtkjoy.h
index feabd4b..266fae6 100644
--- a/src/gtkjoy.h
+++ b/src/gtkjoy.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  * Code based on:
  * gtkjoy.c - general routines for handling joystick events
diff --git a/src/gui.c b/src/gui.c
index a92af90..fb50df4 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -35,6 +34,7 @@
 #include "io.h"
 #include "gmameui-gamelist-view.h"
 #include "gmameui-sidebar.h"
+#include "gmameui-zip-utils.h"
 
 static guint timeout_icon;
 
@@ -48,13 +48,13 @@ adjustment_scrolled (GtkAdjustment *adjustment,
 		g_source_remove (timeout_icon);
 		
 	else
-	timeout_icon =
-		g_timeout_add (ICON_TIMEOUT,
-			       (GSourceFunc) adjustment_scrolled_delayed, gamelist_view);
+		timeout_icon = g_timeout_add (ICON_TIMEOUT,
+					      (GSourceFunc) adjustment_scrolled_delayed,
+					      gamelist_view);
 	timeout_icon = 0;
 }
 
-void
+int
 init_gui (void)
 {
 	GtkTooltips *tooltips;
@@ -81,6 +81,8 @@ g_message (_("Time to initialise icons: %.02f seconds"), g_timer_elapsed (mytime
 #endif
 	/* Create the main window */
 	MainWindow = create_MainWindow ();
+	if (!MainWindow)
+		return -1;
 #ifdef ENABLE_DEBUG
 g_message (_("Time to create main window, filters and gamelist: %.02f seconds"), g_timer_elapsed (mytimer, NULL));
 #endif
@@ -112,6 +114,8 @@ g_message (_("Time to create main window, filters and gamelist: %.02f seconds"),
 	g_message (_("Time to complete start of UI: %.02f seconds"), g_timer_elapsed (mytimer, NULL));
 	g_timer_destroy (mytimer);
 #endif
+
+	return 0;
 }
 
 static void
@@ -366,32 +370,42 @@ gamelist_popupmenu_show (GdkEventButton *event)
    specified). Search first for the .ico file for the ROM, then for the parent
    ROM, then for the icon zipfile */
 GdkPixbuf *
-get_icon_for_rom (MameRomEntry *rom, guint size, ZIP *zip)
+get_icon_for_rom (MameRomEntry *rom,
+		  guint size,
+		  gchar *icon_dir,
+		  gchar *zipfilename,
+		  gboolean usecustomicons)
 {
 	GdkPixbuf *pixbuf, *scaled_pixbuf = NULL;
 	gchar *icon_filename;
 	gchar *icon_path;
-	gchar *icon_dir;
 	GError **error = NULL;
-	
+
 	const gchar *romname;
 	const gchar *parent_romname;
-	
+
 	g_return_val_if_fail (rom != NULL, NULL);
 	
 	romname = mame_rom_entry_get_romname (rom);
 	parent_romname = mame_rom_entry_get_parent_romname (rom);
 
 	GMAMEUI_DEBUG ("Attempting to get icon for ROM %s", romname);
+
+	/* Use the status icon if we are not using custom icons, or if the
+	   ROM status is not correct (want to emphasis incorrect ROMs) */
+	if (!usecustomicons || (mame_rom_entry_get_rom_status (rom) != CORRECT)) {
+		pixbuf = Status_Icons [mame_rom_entry_get_rom_status (rom)];
+		/* Return pixbuf here, since we don't need to scale/resize it */
+		return pixbuf;
+	} else {
+		/* Look for <romname>.ico in icon dir */
+		icon_filename = g_strdup_printf ("%s.ico", romname);
+		icon_path = g_build_filename (icon_dir, icon_filename, NULL);
+		pixbuf = gdk_pixbuf_new_from_file (icon_path, error);
 	
-	g_object_get (main_gui.gui_prefs, "dir-icons", &icon_dir, NULL);
-	
-	icon_filename = g_strdup_printf ("%s.ico", romname);
-	icon_path = g_build_filename (icon_dir, icon_filename, NULL);
-	pixbuf = gdk_pixbuf_new_from_file (icon_path, error);
-	
-	g_free (icon_filename);
-	g_free (icon_path);
+		g_free (icon_filename);
+		g_free (icon_path);
+	}
 
 	/* If icon not found, try looking for parent's icon */
 	if ((pixbuf == NULL) && mame_rom_entry_is_clone (rom)) {
@@ -405,13 +419,8 @@ get_icon_for_rom (MameRomEntry *rom, guint size, ZIP *zip)
 	}
 
 	/* If icon not found, look in a zipfile */
-	if (pixbuf == NULL) {
-		if (zip != 0) {
-			GMAMEUI_DEBUG ("Attempting to get icon for ROM %s from icon zipfile", romname);
-			rewindzip (zip);
-			pixbuf = get_pixbuf_from_zip_file (zip, romname, parent_romname);					
-		}
-	}
+	if (pixbuf == NULL)
+		pixbuf = read_pixbuf_from_zip_file (zipfilename, (gchar *)  romname);
 
 	if (pixbuf != NULL) {
 		GMAMEUI_DEBUG ("Found icon for ROM %s, scaling to size %ix%i", romname, size, size);
@@ -420,8 +429,6 @@ get_icon_for_rom (MameRomEntry *rom, guint size, ZIP *zip)
 	} else
 		GMAMEUI_DEBUG ("Could not find icon for %s", romname);
 	
-	g_free (icon_dir);
-	
 	return scaled_pixbuf;
 }
 
diff --git a/src/gui.h b/src/gui.h
index 076f17d..d81cd40 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -37,7 +36,6 @@
 #include <gtk/gtktoolbar.h>
 
 #include "gmameui.h"
-#include "unzip.h"
 #include "callbacks.h"
 #include "mame_options.h"
 #include "mame_options_legacy.h"
@@ -230,9 +228,10 @@ GdkPixbuf * gmameui_get_icon_from_stock (const char *);
 GtkWidget * gmameui_get_image_from_stock (const char *);
 
 void add_exec_menu(void);
-void init_gui(void);
+int init_gui(void);
 
-GdkPixbuf * get_icon_for_rom (MameRomEntry *rom, guint size, ZIP *zip);
+GdkPixbuf * get_icon_for_rom (MameRomEntry *rom, guint size, gchar *icon_dir,
+							  gchar *zipfilename, gboolean usecustomicons);
 GdkPixbuf * gmameui_get_icon_from_stock (const char *id);
 GtkWidget * gmameui_get_image_from_stock (const char *id);
 void get_status_icons (void);
diff --git a/src/gui_prefs.c b/src/gui_prefs.c
index d8d9b87..e87daf9 100644
--- a/src/gui_prefs.c
+++ b/src/gui_prefs.c
@@ -6,7 +6,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -24,17 +23,12 @@
 /* Set in Glade file, add new property, add get handler, add set handler, add support in gui_prefs_dialog,
    add load in init, add cleanup in finalise */
 
+#include "common.h"
 
 #include <string.h>
 #include <sys/stat.h>   /* For S_IRWXU */
-
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
 #include <glib/gstdio.h>	/* For g_mkdir */
-#include <glade/glade.h>
 
-#include "common.h"
 #include "gmameui.h"
 #include "gui_prefs.h"
 #include "rom_entry.h"
@@ -69,6 +63,7 @@ enum
 {
 	GUI_PREFS_COL_TOGGLED,    /* Emitted when a column is toggled */
 	GUI_PREFS_THEPREFIX_TOGGLED,    /* Emitted when "The" as a prefix is toggled */
+	GUI_PREFS_PREFERCUSTOMICONS_TOGGLED,    /* Emitted when "Prefer custom icons" is toggled */
 	LAST_GUI_PREFS_SIGNAL
 };
 static guint signals[LAST_GUI_PREFS_SIGNAL] = { 0 };
@@ -108,6 +103,7 @@ struct _MameGuiPrefsPrivate {
 	gboolean GameCheck;		/* Check for new games on startup FIXME NOT USED? */
 	gboolean VersionCheck;		/* Check for new version of MAME on startup */
 	gboolean use_xmame_options;     /* Use MAME options, or options set within GMAMEUI */
+	gboolean prefercustomicons;     /* Whether to use custom icons or status icons in gamelist */
 	gboolean gui_joy;
 	gchar *joystick_name;
 	
@@ -188,6 +184,11 @@ mame_gui_prefs_set_property (GObject *object,
 		case PROP_USEXMAMEOPTIONS:
 			prefs->priv->use_xmame_options = g_value_get_boolean (value);
 			break;
+		case PROP_PREFERCUSTOMICONS:
+			prefs->priv->prefercustomicons = g_value_get_boolean (value);
+			/* Emit the signal (so gamelist view can be changed */
+			g_signal_emit (G_OBJECT (prefs), signals[GUI_PREFS_PREFERCUSTOMICONS_TOGGLED], 0,
+				       prefs->priv->theprefix);
 		case PROP_USEJOYINGUI:
 			prefs->priv->gui_joy = g_value_get_boolean (value);
 			break;
@@ -338,6 +339,9 @@ mame_gui_prefs_get_property (GObject *object,
 		case PROP_USEXMAMEOPTIONS:
 			g_value_set_boolean (value, prefs->priv->use_xmame_options);
 			break;
+		case PROP_PREFERCUSTOMICONS:
+			g_value_set_boolean (value, prefs->priv->prefercustomicons);
+			break;	
 		case PROP_USEJOYINGUI:
 			g_value_set_boolean (value, prefs->priv->gui_joy);
 			break;
@@ -509,6 +513,9 @@ mame_gui_prefs_class_init (MameGuiPrefsClass *klass)
 					 PROP_USEXMAMEOPTIONS,
 					 g_param_spec_boolean ("usexmameoptions", "Use MAME Options", "Use MAME options, rather than those set in GMAMEUI", FALSE, G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
+					 PROP_PREFERCUSTOMICONS,
+					 g_param_spec_boolean ("prefercustomicons", "Prefer custom icons", "Prefer custom icons over status icons", FALSE, G_PARAM_READWRITE));
+	g_object_class_install_property (object_class,
 					 PROP_USEJOYINGUI,
 					 g_param_spec_boolean ("usejoyingui", "Use Joystick in GUI", "Use the joystick to navigate in GMAMEUI", 0, G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
@@ -565,6 +572,15 @@ mame_gui_prefs_class_init (MameGuiPrefsClass *klass)
 						     G_TYPE_NONE,    /* Return type */
 						     1, G_TYPE_BOOLEAN);
 
+	/* Signal emitted when custom icon preference is toggled */
+	signals[GUI_PREFS_PREFERCUSTOMICONS_TOGGLED] = g_signal_new ("prefercustomicons-toggled",
+						     G_OBJECT_CLASS_TYPE (object_class),
+						     G_SIGNAL_RUN_LAST,
+						     G_STRUCT_OFFSET (MameGuiPrefsClass, prefercustomicons_toggled),
+						     NULL, NULL,     /* Accumulator and accumulator data */
+						     gmameui_marshaller_VOID__BOOLEAN,
+						     G_TYPE_NONE,    /* Return type */
+						     1, G_TYPE_BOOLEAN);
 }
 
 static void
@@ -624,6 +640,11 @@ mame_gui_prefs_init (MameGuiPrefs *pr)
 		GMAMEUI_DEBUG ("Value for cols-shown at %d is %d", i, g_value_get_int (&val));
 		g_value_array_append (pr->priv->cols_shown, &val);
 	}
+	if (error) {
+		GMAMEUI_DEBUG ("Error retrieving cols-shown: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
 
 	int_array = g_key_file_get_integer_list (pr->priv->prefs_ini_file, "Preferences", "cols-width", &columnsize, &error);
 	for (i = 0; i < NUMBER_COLUMN; ++i) {
@@ -634,6 +655,12 @@ mame_gui_prefs_init (MameGuiPrefs *pr)
 		GMAMEUI_DEBUG ("Value for cols-width at %d is %d", i, g_value_get_int (&val));
 		g_value_array_append (pr->priv->cols_width, &val);
 	}
+	if (error) {
+		GMAMEUI_DEBUG ("Error retrieving cols-width: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
+
 	pr->priv->sort_col = mame_gui_prefs_get_int_property_from_key_file (pr, "sort-col");
 	pr->priv->sort_col_direction = mame_gui_prefs_get_int_property_from_key_file (pr, "sort-col-direction");
 	pr->priv->xpos_filters = mame_gui_prefs_get_int_property_from_key_file (pr, "xpos-filters");
@@ -643,6 +670,7 @@ mame_gui_prefs_init (MameGuiPrefs *pr)
 	pr->priv->GameCheck = mame_gui_prefs_get_bool_property_from_key_file (pr, "gamecheck");
 	pr->priv->VersionCheck = mame_gui_prefs_get_bool_property_from_key_file (pr, "versioncheck");
 	pr->priv->use_xmame_options = mame_gui_prefs_get_bool_property_from_key_file (pr, "usexmameoptions");
+	pr->priv->prefercustomicons = mame_gui_prefs_get_bool_property_from_key_file (pr, "prefercustomicons");
 	pr->priv->gui_joy = mame_gui_prefs_get_bool_property_from_key_file (pr, "usejoyingui");
 	pr->priv->joystick_name = mame_gui_prefs_get_string_property_from_key_file (pr, "joystick-name");
 	if (!pr->priv->joystick_name)
@@ -665,6 +693,11 @@ mame_gui_prefs_init (MameGuiPrefs *pr)
 		GMAMEUI_DEBUG ("Value for executable-paths at %d is %s", i, g_value_get_string (&val));
 		g_value_array_append (pr->priv->executable_paths, &val);
 	}
+	if (error) {
+		GMAMEUI_DEBUG ("Error retrieving executable-paths: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
 	
 	/* Load the ROM paths */
 	str_array = g_key_file_get_string_list (pr->priv->prefs_ini_file, "Preferences", "rom-paths", &paths, &error);
@@ -677,6 +710,11 @@ mame_gui_prefs_init (MameGuiPrefs *pr)
 		GMAMEUI_DEBUG ("Value for rom-paths at %d is %s", i, g_value_get_string (&val));
 		g_value_array_append (pr->priv->rom_paths, &val);
 	}
+	if (error) {
+		GMAMEUI_DEBUG ("Error retrieving rom-paths: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
 	
 	/* Load the Samples paths */
 	str_array = g_key_file_get_string_list (pr->priv->prefs_ini_file, "Preferences", "sample-paths", &paths, &error);
@@ -689,6 +727,11 @@ mame_gui_prefs_init (MameGuiPrefs *pr)
 		GMAMEUI_DEBUG ("Value for sample-paths at %d is %s", i, g_value_get_string (&val));
 		g_value_array_append (pr->priv->sample_paths, &val);
 	}
+	if (error) {
+		GMAMEUI_DEBUG ("Error retrieving sample-paths: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
 	
 	/* Directory preferences */
 	GMAMEUI_DEBUG ("Reading directories preferences from file");
@@ -735,6 +778,7 @@ mame_gui_prefs_init (MameGuiPrefs *pr)
 	g_signal_connect (pr, "notify::gamecheck", (GCallback) mame_gui_prefs_save_bool, NULL);
 	g_signal_connect (pr, "notify::versioncheck", (GCallback) mame_gui_prefs_save_bool, NULL);
 	g_signal_connect (pr, "notify::usexmameoptions", (GCallback) mame_gui_prefs_save_bool, NULL);
+	g_signal_connect (pr, "notify::prefercustomicons", (GCallback) mame_gui_prefs_save_bool, NULL);
 	g_signal_connect (pr, "notify::usejoyingui", (GCallback) mame_gui_prefs_save_bool, NULL);
 	g_signal_connect (pr, "notify::joystick-name", (GCallback) mame_gui_prefs_save_string, NULL);
 	g_signal_connect (pr, "notify::theprefix", (GCallback) mame_gui_prefs_save_bool, NULL);
diff --git a/src/gui_prefs.h b/src/gui_prefs.h
index 6cf5d43..ebd101c 100644
--- a/src/gui_prefs.h
+++ b/src/gui_prefs.h
@@ -5,7 +5,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -59,6 +58,7 @@ struct _MameGuiPrefsClass {
 
 	void (*col_toggled) (MameGuiPrefs *prefs, GValueArray *cols);
 	void (*theprefix_toggled) (MameGuiPrefs *prefs, gboolean theprefix);
+	void (*prefercustomicons_toggled) (MameGuiPrefs *prefs, gboolean prefercustomicons);
 };
 
 /* Preferences */
@@ -86,6 +86,7 @@ enum
 	PROP_GAMECHECK,
 	PROP_VERSIONCHECK,
 	PROP_USEXMAMEOPTIONS,
+	PROP_PREFERCUSTOMICONS,
 	PROP_USEJOYINGUI,
 	PROP_JOYSTICKNAME,
 	/* Miscellaneous preferences */
diff --git a/src/gui_prefs_dialog.c b/src/gui_prefs_dialog.c
index aa611fa..242fa66 100644
--- a/src/gui_prefs_dialog.c
+++ b/src/gui_prefs_dialog.c
@@ -2,11 +2,11 @@
 /*
  * GMAMEUI
  *
- * Copyright 2007-2008 Andrew Burton <adb at iinet.net.au>
+ * Copyright 2007-2009 Andrew Burton <adb at iinet.net.au>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -120,6 +119,7 @@ mame_gui_prefs_dialog_init (MameGuiPrefsDialog *dlg)
 	gboolean gamecheck;
 	gboolean versioncheck;
 	gboolean usexmameoptions;
+	gboolean prefercustomicons;
 	gboolean usejoyingui;
 	gchar *joystick_name;
 	gboolean theprefix;
@@ -144,6 +144,7 @@ GMAMEUI_DEBUG ("Initialising gui prefs dialog");
 		      "gamecheck", &gamecheck,
 		      "versioncheck", &versioncheck,
 		      "usexmameoptions", &usexmameoptions,
+		      "prefercustomicons", &prefercustomicons,
 		      "usejoyingui", &usejoyingui,
 		      "joystick-name", &joystick_name,
 		      /* Column options */
@@ -168,6 +169,11 @@ GMAMEUI_DEBUG ("Initialising gui prefs dialog");
 	g_signal_connect (widget, "toggled", 
 			  G_CALLBACK (on_prefs_checkbutton_toggled), "usexmameoptions");
 	
+	widget = glade_xml_get_widget (xml, "prefercustomicons");
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), prefercustomicons);
+	g_signal_connect (widget, "toggled", 
+			  G_CALLBACK (on_prefs_checkbutton_toggled), "prefercustomicons");
+	
 	widget = glade_xml_get_widget (xml, "usejoyingui");
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), usejoyingui);
 	g_signal_connect (widget, "toggled", 
diff --git a/src/gui_prefs_dialog.h b/src/gui_prefs_dialog.h
index 7acf83b..a935080 100644
--- a/src/gui_prefs_dialog.h
+++ b/src/gui_prefs_dialog.h
@@ -5,7 +5,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/interface.c b/src/interface.c
index 464538b..51f3e4f 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -96,6 +95,21 @@ on_filter_btn_toggled (GtkWidget *widget, gpointer user_data)
 	mame_gamelist_view_repopulate_contents (main_gui.displayed_list);
 }
 
+static GtkWidget *
+get_filter_btn_by_id (GladeXML *xml, gint i)
+{
+	GtkWidget *radio = NULL;
+
+	if (i == 0)
+		radio = glade_xml_get_widget (xml, "filter_btn_all");
+	else if (i == 1)
+		radio = glade_xml_get_widget (xml, "filter_btn_avail");
+	else if (i == 2)
+		radio = glade_xml_get_widget (xml, "filter_btn_unavail");
+
+	return radio;
+}
+
 void
 on_toolbar_view_menu_activate (GtkAction *action,
 			       gpointer          user_data)
@@ -505,7 +519,7 @@ create_MainWindow (void)
 	
 	GtkWidget *toolbar_widget;
 	GtkWidget *toolbar_icon;
-	
+
 	int z;
 	for (z = 0; z < NUM_TOOLBAR_ITEMS; z++) {
 		toolbar_widget = gtk_ui_manager_get_widget (main_gui.manager,
@@ -535,34 +549,31 @@ GMAMEUI_DEBUG ("Setting up search entry field... done");
 
 	/* Prepare the ROM availability filter buttons */
 GMAMEUI_DEBUG ("Setting up ROM availability filter buttons...");
-	GList *filter_btn_list, *list;
 	
+	GList *filter_btn_list, *list;
 	gint current_filter_btn;
+	
 	filter_btn_list = glade_xml_get_widget_prefix (xml, "filter_btn_");
 	g_object_get (main_gui.gui_prefs, "current-rom-filter", &current_filter_btn, NULL);
-	i = 0;
 	
 	for (list = g_list_first (filter_btn_list);
 	     list != NULL;
 	     list = g_list_next (list)) {	
-		     
 		/* Hide the radio circle so only the button is visible */
 		gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (list->data), FALSE);
-		     
-		/* Set the button based on the preference */
-		/* AAA FIXME TODO Not working */
-		if (i == current_filter_btn)
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (list->data), TRUE);
-		
+
 		/* Set the signal callback */
 		g_signal_connect (G_OBJECT (list->data), "toggled",
 				  G_CALLBACK (on_filter_btn_toggled), NULL);
-		
-		i++;
 	}
+	
+	/* Set the button based on the preference */
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (get_filter_btn_by_id (xml, current_filter_btn)),
+				      TRUE);
+
 GMAMEUI_DEBUG ("Setting up ROM availability filter buttons... done");	
 	/* End ROM availability filter buttons */
-	
+		
 	main_gui.filters_list = gmameui_filters_list_new ();
 
 /* FIXME TODO
@@ -768,12 +779,17 @@ GMAMEUI_DEBUG ("Setting up ROM availability filter buttons... done");
 #endif
 	/* Create the UI of the Game List */
 	main_gui.displayed_list = mame_gamelist_view_new ();
-mame_gamelist_view_scroll_to_selected_game (main_gui.displayed_list);
+	mame_gamelist_view_scroll_to_selected_game (main_gui.displayed_list);
 	
-	gtk_container_add (GTK_CONTAINER (main_gui.scrolled_window_games), main_gui.displayed_list);
+	gtk_container_add (GTK_CONTAINER (main_gui.scrolled_window_games), GTK_WIDGET (main_gui.displayed_list));
 	gtk_widget_show_all (main_gui.scrolled_window_games);
 	
 	gtk_paned_set_position (GTK_PANED (main_gui.hpanedLeft), xpos_filters);
+
+	/* Update UI if executables or entries in the MameGamelistView are
+	   not available */
+	gmameui_ui_set_items_sensitive ();
+
 	g_signal_connect (G_OBJECT (main_gui.hpanedLeft), "notify::position",
 			  G_CALLBACK (on_hpaned_position_notify), NULL);
 	
diff --git a/src/interface.h b/src/interface.h
index 89e87b0..f30cdc3 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -1,13 +1,13 @@
 /*
  * GMAMEUI
  *
- * Copyright 2007-2008 Andrew Burton <adb at iinet.net.au>
+ * Copyright 2007-2009 Andrew Burton <adb at iinet.net.au>
  * based on GXMame code
  * 2002-2005 Stephane Pontier <shadow_walker at users.sourceforge.net>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -47,9 +46,13 @@ enum {
 	TOOLBAR_VIEWFOLDERLIST,
 	TOOLBAR_VIEWSIDEBAR,
 	TOOLBAR_LISTVIEW,
+#ifdef TREESTORE
 	TOOLBAR_TREEVIEW,
+#endif
 	TOOLBAR_DETAILSLISTVIEW,
+#ifdef TREESTORE
 	TOOLBAR_DETAILSTREEVIEW,
+#endif
 	NUM_TOOLBAR_ITEMS
 };
 
@@ -70,9 +73,13 @@ static const toolbar_item toolbar_items [] = {
 	{ TOOLBAR_VIEWFOLDERLIST, "/ToolBar/ViewFolderList", "gmameui-view-folders", 0, N_("Show Folders") },
 	{ TOOLBAR_VIEWSIDEBAR, "/ToolBar/ViewSidebarPanel", "gmameui-view-screenshot", 0, N_("Show Sidebar") },
 	{ TOOLBAR_LISTVIEW, "/ToolBar/ViewListView", "gmameui-view-list", 0, N_("List") },
+#ifdef TREESTORE
 	{ TOOLBAR_TREEVIEW, "/ToolBar/ViewTreeView", "gmameui-view-tree", 0, N_("List Tree") },
+#endif
 	{ TOOLBAR_DETAILSLISTVIEW, "/ToolBar/ViewDetailsListView", "gmameui-view-list", 0, N_("Details") },
+#ifdef TREESTORE
 	{ TOOLBAR_DETAILSTREEVIEW, "/ToolBar/ViewDetailsTreeView", "gmameui-view-tree", 0, N_("Details Tree") },
+#endif
 };
 
 /* Signal prototypes */
diff --git a/src/io.c b/src/io.c
index 6dbc7ec..59ee8f8 100644
--- a/src/io.c
+++ b/src/io.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 #include <stdio.h>
diff --git a/src/io.h b/src/io.h
index e368a4c..b43b9d1 100644
--- a/src/io.h
+++ b/src/io.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/keyboard.c b/src/keyboard.c
index dd3a09d..100ee3d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/keyboard.h b/src/keyboard.h
index 8782d35..eb53328 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mame-exec-list.c b/src/mame-exec-list.c
index 061164c..7640935 100644
--- a/src/mame-exec-list.c
+++ b/src/mame-exec-list.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mame-exec-list.h b/src/mame-exec-list.h
index 9274c1a..d8f7911 100644
--- a/src/mame-exec-list.h
+++ b/src/mame-exec-list.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mame-exec.c b/src/mame-exec.c
index a604c20..b3109cc 100644
--- a/src/mame-exec.c
+++ b/src/mame-exec.c
@@ -6,7 +6,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -1255,6 +1254,26 @@ mame_get_options (MameExec *exec)
 	return exec->priv->supported_options;
 }
 
+/* Check whether the option is a toggle option that is turned off by
+   using the -no<option> syntax, e.g. -nolog. Some versions of XMAME
+   (e.g. 0.92) simply omit the option, others (e.g. 0.106) use -nolog */
+gboolean
+mame_option_supports_no_prefix (MameExec *exec, const gchar *option_name)
+{
+	g_return_val_if_fail (exec != NULL, FALSE);
+	
+	const MameOption *option;
+	
+	option = g_hash_table_lookup (exec->priv->supported_options, option_name);
+	
+	if (!option) {
+		GMAMEUI_DEBUG ("The option %s does not have a listing in the hash table", option_name);
+		return FALSE;
+	}
+	
+	return option->no_option;
+}
+
 gboolean
 mame_has_option (MameExec *exec, const gchar *option_name)
 {
diff --git a/src/mame-exec.h b/src/mame-exec.h
index 13823bb..e8fd6d7 100644
--- a/src/mame-exec.h
+++ b/src/mame-exec.h
@@ -5,7 +5,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -115,6 +114,9 @@ mame_get_options (MameExec *exec);
 const gchar
 *mame_get_option_name (const MameExec *exec, const gchar* option_name);
 
+gboolean
+mame_option_supports_no_prefix (MameExec *exec, const gchar *option_name);
+
 /** Checks if the executable has the given option */
 gboolean
 mame_has_option (MameExec *exec, const gchar *option_name);
diff --git a/src/mame_options.c b/src/mame_options.c
index c11274d..3a42f16 100644
--- a/src/mame_options.c
+++ b/src/mame_options.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mame_options.h b/src/mame_options.h
index 8463df1..9699bc3 100644
--- a/src/mame_options.h
+++ b/src/mame_options.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mame_options_dialog.c b/src/mame_options_dialog.c
index 22f7f9c..1596f51 100644
--- a/src/mame_options_dialog.c
+++ b/src/mame_options_dialog.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mame_options_dialog.h b/src/mame_options_dialog.h
index 51db887..30b9862 100644
--- a/src/mame_options_dialog.h
+++ b/src/mame_options_dialog.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mame_options_legacy.c b/src/mame_options_legacy.c
index ae21e46..eb4ec24 100644
--- a/src/mame_options_legacy.c
+++ b/src/mame_options_legacy.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -110,6 +109,8 @@ enum {
 	LEGACY_OPTION_MAXAUTOFRAMESKIP,
 	LEGACY_OPTION_BRIGHTNESS,
 	LEGACY_OPTION_PAUSE_BRIGHTNESS,
+	LEGACY_OPTION_EFFECT,
+	LEGACY_OPTION_SCANLINES,
 	LEGACY_OPTION_GAMMA,
 	LEGACY_OPTION_NOROTATE,
 	LEGACY_OPTION_ROR,
@@ -118,6 +119,10 @@ enum {
 	LEGACY_OPTION_AUTOROL,
 	LEGACY_OPTION_FLIPX,
 	LEGACY_OPTION_FLIPY,
+
+	LEGACY_OPTION_HEIGHTSCALE,
+	LEGACY_OPTION_WIDTHSCALE,
+	LEGACY_OPTION_BPP,
 	
 	/* Artwork */
 	LEGACY_OPTION_ARTWORK,
@@ -137,9 +142,6 @@ enum {
 	LEGACY_OPTION_ANTIALIAS,
 	LEGACY_OPTION_TRANSLUCENCY,
 	
-	LEGACY_OPTION_HEIGHTSCALE,
-	LEGACY_OPTION_WIDTHSCALE,
-	
 	/* OpenGL options */
 	LEGACY_OPTION_GLDOUBLEBUF,
 	LEGACY_OPTION_GLTEXTURESIZE,
@@ -197,14 +199,8 @@ static _MameSupportedOptionsLegacyInt MameSupportedOptionsLegacyInt[] =
 	{ LEGACY_OPTION_ARBHEIGHT, "Video", "arbheight", 1, 0, 4096, { 0, } },    /* AKA ah */
 	{ LEGACY_OPTION_HEIGHTSCALE, "Video", "heightscale", 1, 1, 8, { 0, } },    /* AKA hs */
 	{ LEGACY_OPTION_WIDTHSCALE, "Video", "widthscale", 1, 1, 8, { 0, } },    /* AKA ws */
-	{ LEGACY_OPTION_AUTOFRAMESKIP, "Video", "frameskip", 0, 0, 12, { 0, } },    /* AKA fs */
 	{ LEGACY_OPTION_MAXAUTOFRAMESKIP, "Video", "maxautoframeskip", 1, 1, 12, { 0, } },    /* AKA mafs */
-	{ LEGACY_OPTION_ARTWORKRES, "Artwork", "artwork_resolution", 0, 0, 2, { 0, } },
-	{ LEGACY_OPTION_GLTEXTURESIZE, "OpenGL", "gl_texturesize", 0, 0, 2048, { 0, } },
-	{ LEGACY_OPTION_SOUND_VOLUME, "Sound", "volume", 0, -32, 0, { 0, } },       /* AKA v */
-	{ LEGACY_OPTION_SOUND_SAMPLERATE, "Sound", "samplefreq", 44100, 8000, 48000, { 0, } },
-	{ LEGACY_OPTION_INPUT_JOYTYPE, "Input", "joytype", 0, 0, 7, { 0, } },
-	{ LEGACY_OPTION_MAME_BIOS, "MAME", "bios", 0, 0, 14, { 0, } },
+	{ LEGACY_OPTION_GLTEXTURESIZE, "OpenGL", "gltexture_size", 0, 0, 2048, { 0, } },
 };
 
 /* Boolean options. These options are prefixed by 'no' if the value is set off */
@@ -215,6 +211,7 @@ static _MameSupportedOptionsLegacyBool MameSupportedOptionsLegacyBool[] =
 	{ LEGACY_OPTION_AUTODOUBLE, "Video", "autodouble", TRUE, { 0, } },     /* AKA adb */
 	{ LEGACY_OPTION_THROTTLE, "Video", "throttle", TRUE, { 0, } },     /* AKA th */
 	{ LEGACY_OPTION_SLEEPIDLE, "Video", "sleepidle", TRUE, { 0, } },     /* AKA si */
+	{ LEGACY_OPTION_SCANLINES, "Video", "scanlines", TRUE, { 0, } },
 	{ LEGACY_OPTION_AUTOFRAMESKIP, "Video", "autoframeskip", TRUE, { 0, } },     /* AKA afs */
 	{ LEGACY_OPTION_NOROTATE, "Video", "norotate", TRUE, { 0, } },     /* AKA nr */
 	{ LEGACY_OPTION_ROR, "Video", "ror", FALSE, { 0, } },     /* AKA ror */
@@ -285,6 +282,7 @@ static _MameSupportedOptionsLegacyDbl MameSupportedOptionsLegacyDbl[] =
 	{ LEGACY_OPTION_BEAM, "Vector", "beam", 1, 1, 16, { 0, } },    /* AKA B */
 	{ LEGACY_OPTION_FLICKER, "Vector", "flicker", 0, 0, 1, { 0, } },    /* AKA f */
 	{ LEGACY_OPTION_INTENSITY, "Vector", "intensity", 1, 0, 1, { 0, } },
+	{ LEGACY_OPTION_SOUND_VOLUME, "Sound", "volume", 0, -32, 0, { 0, } },       /* AKA v */
 	{ LEGACY_OPTION_SOUND_BUFSIZE, "Sound", "bufsize", 1, 0, 5, { 0, } },   /* AKA bs */
 	
 	{ LEGACY_OPTION_GLBEAM, "OpenGL", "glbeam", 1, 0, 100, { 0, } },
@@ -293,6 +291,7 @@ static _MameSupportedOptionsLegacyDbl MameSupportedOptionsLegacyDbl[] =
 /* FIXME TODO Set default values for ALL options */
 
 /* String options */
+/* Note that options intended to be displayed in ComboBoxes (e.g. effect) should be strings */
 static _MameSupportedOptionsLegacyString MameSupportedOptionsLegacyString[] =
 {
 	{ LEGACY_OPTION_VECTORRES, "Vector", "vectorres", "640x480", { 0, } },
@@ -302,6 +301,14 @@ static _MameSupportedOptionsLegacyString MameSupportedOptionsLegacyString[] =
 	{ LEGACY_OPTION_SOUND_MIXERPLUGIN, "Sound", "sound-mixer-plugin", "", { 0, } },
 	{ LEGACY_OPTION_FILE_STDERR, "File", "stderr-file", "stderr.log", { 0, } },
 	{ LEGACY_OPTION_FILE_STDOUT, "File", "stdout-file", "stdout.log", { 0, } },
+	/* The following are combobox entries so are marked as strings */
+	{ LEGACY_OPTION_EFFECT, "Video", "effect", "0", { 0, } },    /* AKA ef */
+	{ LEGACY_OPTION_AUTOFRAMESKIP, "Video", "frameskip", "0", { 0, } },    /* AKA fs */
+	{ LEGACY_OPTION_EFFECT, "Video", "bpp", "0", { 0, } },
+	{ LEGACY_OPTION_ARTWORKRES, "Artwork", "artwork_resolution", "0", { 0, } },
+	{ LEGACY_OPTION_MAME_BIOS, "MAME", "bios", "0", { 0, } },
+	{ LEGACY_OPTION_INPUT_JOYTYPE, "Input", "joytype", "0", { 0, } },
+	{ LEGACY_OPTION_SOUND_SAMPLERATE, "Sound", "samplefreq", "44100", { 0, } },
 
 };
 
@@ -367,10 +374,16 @@ mame_options_legacy_get_option_string (MameOptionsLegacy *opts, gchar *category)
 						       MameSupportedOptionsLegacyBool[i].key,
 						       NULL);
 			} else {
-				command = g_strconcat (command,
-						       " -no",
-						       MameSupportedOptionsLegacyBool[i].key,
-						       NULL);
+				/* Some toggle options are disabled using 'no' as a
+				   prefix (e.g. -nolog) but we need to check whether MAME
+				   recognises them first */
+				if (mame_option_supports_no_prefix (exec, MameSupportedOptionsLegacyBool[i].key)) {
+					command = g_strconcat (command,
+							       " -no",
+							       MameSupportedOptionsLegacyBool[i].key,
+							       NULL);
+				} /* else we simply omit it */
+
 			}
 		
 			g_free (catkey);
@@ -455,7 +468,27 @@ mame_options_legacy_get_option_string (MameOptionsLegacy *opts, gchar *category)
 static void
 mame_options_legacy_save_string (MameOptionsLegacy *opts, GParamSpec *param, gpointer user_data)
 {
-	GMAMEUI_DEBUG ("FIXME TODO mame_options_save_string: %s", param->name);
+	GMAMEUI_DEBUG ("mame_options_save_string: %s", param->name);
+	/* param->name will be of the form Category-Key, e.g. Video-beam */
+	
+//	gchar** stv;
+//	GValue *dbl_value;
+	_MameSupportedOptionsLegacyString *opt;
+	gchar *value;
+
+	g_return_if_fail (MAME_IS_OPTIONS_LEGACY (opts));
+	g_return_if_fail (param->name != NULL);
+	
+	opt = (_MameSupportedOptionsLegacyString *) user_data;
+	g_return_if_fail (opt != NULL);
+	
+	value = g_value_get_string (&opt->value);
+	
+//	stv = g_strsplit (param->name, "-", 2); /* Split only on the first '-', so keys with a '-' are ignored */
+	g_key_file_set_string (opts->priv->options_file, opt->category, opt->key, value);
+//	g_strfreev (stv);
+	
+	g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename, NULL);
 }
 
 static void
@@ -587,7 +620,8 @@ mame_legacy_options_get (MameOptionsLegacy *opts, const gchar *key)
 		GMAMEUI_DEBUG ("Error retrieving string option %s: %s", key, error->message);
 		g_error_free (error);
 		error = NULL;
-		
+/* FIXME TODO Set default value and use the G_CONSTRUCT parameter to set it up automatically
+   (both for this and other similar instances */		
 		/* Value doesn't exist in the file, so we need to use the default value */
 		GParamSpec *spec;
 		GValue value = { 0, };
@@ -614,7 +648,7 @@ mame_legacy_options_set_int (MameOptionsLegacy *opts, gchar *key, gint value)
 	gchar *prop_name;
 	
 	prop_name = g_strdup (key);
-	prop_name = g_strcanon (prop_name, G_CSET_A_2_Z G_CSET_a_2_z "-", '-');
+	prop_name = g_strcanon (prop_name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 	g_object_set (opts, prop_name, value, NULL);
 	g_free (prop_name);
 }
@@ -625,7 +659,7 @@ mame_legacy_options_set_dbl (MameOptionsLegacy *opts, gchar *key, gdouble value)
 	gchar *prop_name;
 	
 	prop_name = g_strdup (key);
-	prop_name = g_strcanon (prop_name, G_CSET_A_2_Z G_CSET_a_2_z "-", '-');
+	prop_name = g_strcanon (prop_name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 	g_object_set (opts, prop_name, value, NULL);
 	g_free (prop_name);
 }
@@ -636,7 +670,7 @@ mame_legacy_options_set_string (MameOptionsLegacy *opts, gchar *key, gchar* valu
 	gchar *prop_name;
 	
 	prop_name = g_strdup (key);
-	prop_name = g_strcanon (prop_name, G_CSET_A_2_Z G_CSET_a_2_z "-", '-');
+	prop_name = g_strcanon (prop_name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 	g_object_set (opts, prop_name, value, NULL);
 	g_free (prop_name);
 }
@@ -770,7 +804,7 @@ find_bool_offset (gchar *prop_name)
 	for (i = 0; i < G_N_ELEMENTS (MameSupportedOptionsLegacyBool); i++) {
 		gchar *tmp_prop_name;
 		tmp_prop_name = g_strdup (MameSupportedOptionsLegacyBool[i].key);
-		tmp_prop_name = g_strcanon (tmp_prop_name, G_CSET_A_2_Z G_CSET_a_2_z "-", '-');
+		tmp_prop_name = g_strcanon (tmp_prop_name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 		
 		if (g_ascii_strcasecmp (tmp_prop_name, tokens[1]) == 0) {
 			found = i;
@@ -798,7 +832,7 @@ find_str_offset (gchar *prop_name)
 	for (i = 0; i < G_N_ELEMENTS (MameSupportedOptionsLegacyString); i++) {
 		gchar *tmp_prop_name;
 		tmp_prop_name = g_strdup (MameSupportedOptionsLegacyString[i].key);
-		tmp_prop_name = g_strcanon (tmp_prop_name, G_CSET_A_2_Z G_CSET_a_2_z "-", '-');
+		tmp_prop_name = g_strcanon (tmp_prop_name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 			
 		if (g_ascii_strcasecmp (tmp_prop_name, tokens[1]) == 0) {
 			found = i;
@@ -826,7 +860,7 @@ find_int_offset (gchar *prop_name)
 	for (i = 0; i < G_N_ELEMENTS (MameSupportedOptionsLegacyInt); i++) {
 		gchar *tmp_prop_name;
 		tmp_prop_name = g_strdup (MameSupportedOptionsLegacyInt[i].key);
-		tmp_prop_name = g_strcanon (tmp_prop_name, G_CSET_A_2_Z G_CSET_a_2_z "-", '-');
+		tmp_prop_name = g_strcanon (tmp_prop_name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 		
 		if (g_ascii_strcasecmp (tmp_prop_name, tokens[1]) == 0) {
 			found = i;
@@ -854,7 +888,7 @@ find_dbl_offset (gchar *prop_name)
 	for (i = 0; i < G_N_ELEMENTS (MameSupportedOptionsLegacyDbl); i++) {
 		gchar *tmp_prop_name;
 		tmp_prop_name = g_strdup (MameSupportedOptionsLegacyDbl[i].key);
-		tmp_prop_name = g_strcanon (tmp_prop_name, G_CSET_A_2_Z G_CSET_a_2_z "-", '-');
+		tmp_prop_name = g_strcanon (tmp_prop_name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 		
 		if (g_ascii_strcasecmp (tmp_prop_name, tokens[1]) == 0) {
 			found = i;
@@ -964,7 +998,7 @@ static gchar
 	
 	/* Replace any characters that are not letters or '-'. This
 	   should replace any underline characters */
-	ret = g_strcanon (ret, G_CSET_A_2_Z G_CSET_a_2_z "-", '-');
+	ret = g_strcanon (ret, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 	
 	return ret;
 }
@@ -979,7 +1013,7 @@ mame_options_legacy_class_init (MameOptionsLegacyClass *klass)
 	object_class->set_property = mame_options_legacy_set_property;
 	object_class->get_property = mame_options_legacy_get_property;
 	object_class->finalize = mame_options_legacy_finalize;
-
+GMAMEUI_DEBUG ("Creating MameOptionsLegacy class object...");
 	/* Initialise the class properties - any MAME option which contains an
 	   underscore needs to be have the underscore replaced by a hyphen; this
 	   is to workaround issues with GLib where a property/signal name cannot
@@ -996,7 +1030,7 @@ mame_options_legacy_class_init (MameOptionsLegacyClass *klass)
 Issue: g_param_spec_internal indicates that mixing _ and - cannot be done; signals need - */
 		attr_name = create_property_name (MameSupportedOptionsLegacyBool[i].category,
 						  MameSupportedOptionsLegacyBool[i].key);
-		GMAMEUI_DEBUG ("Creating boolean class property %s with id %d",
+		GMAMEUI_DEBUG ("   Creating boolean class property %s with id %d",
 			       attr_name,
 			       MameSupportedOptionsLegacyBool[i].id);
 		/* Initialise type */
@@ -1021,7 +1055,7 @@ Issue: g_param_spec_internal indicates that mixing _ and - cannot be done; signa
 		attr_name = create_property_name (MameSupportedOptionsLegacyDbl[i].category,
 						  MameSupportedOptionsLegacyDbl[i].key);
 		
-		GMAMEUI_DEBUG ("Creating double class property %s with id %d",
+		GMAMEUI_DEBUG ("   Creating double class property %s with id %d",
 			       attr_name,
 			       MameSupportedOptionsLegacyDbl[i].id);
 		/* Initialise type */
@@ -1046,7 +1080,7 @@ Issue: g_param_spec_internal indicates that mixing _ and - cannot be done; signa
 		attr_name = create_property_name (MameSupportedOptionsLegacyInt[i].category,
 						  MameSupportedOptionsLegacyInt[i].key);
 		
-		GMAMEUI_DEBUG ("Creating integer class property %s with id %d",
+		GMAMEUI_DEBUG ("   Creating integer class property %s with id %d",
 			       attr_name,
 			       MameSupportedOptionsLegacyInt[i].id);
 		/* Initialise type */
@@ -1071,7 +1105,7 @@ Issue: g_param_spec_internal indicates that mixing _ and - cannot be done; signa
 		attr_name = create_property_name (MameSupportedOptionsLegacyString[i].category,
 						  MameSupportedOptionsLegacyString[i].key);
 		
-		GMAMEUI_DEBUG ("Creating string class property %s with id %d",
+		GMAMEUI_DEBUG ("   Creating string class property %s with id %d",
 			       attr_name,
 			       MameSupportedOptionsLegacyString[i].id);
 		/* Initialise type */
@@ -1085,8 +1119,7 @@ Issue: g_param_spec_internal indicates that mixing _ and - cannot be done; signa
 		
 		g_free (attr_name);
 	}
-	
-	
+GMAMEUI_DEBUG ("Creating MameOptionsLegacy class object... done");
 }
 
 static void
diff --git a/src/mame_options_legacy.h b/src/mame_options_legacy.h
index 6b3dab7..35a2650 100644
--- a/src/mame_options_legacy.h
+++ b/src/mame_options_legacy.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mame_options_legacy_dialog.c b/src/mame_options_legacy_dialog.c
index ac11ba4..7c1ccdc 100644
--- a/src/mame_options_legacy_dialog.c
+++ b/src/mame_options_legacy_dialog.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -85,9 +84,9 @@ static const WidgetRelationship widget_relationships[] =
 	{ "Video-autoframeskip", "Video-frameskip", "0" },
 	{ "Video-autoframeskip", "Video-maxautoframeskip", "0" },
 	{ "Video-autoframeskip", "Video-maxautoframeskip", "0" },
-	{ "Artwork-artwork", "Artwork-use-backdrops", "1" },
-	{ "Artwork-artwork", "Artwork-use-bezels", "1" },
-	{ "Artwork-artwork", "Artwork-use-overlays", "1" },
+	{ "Artwork-artwork", "Artwork-use_backdrops", "1" },
+	{ "Artwork-artwork", "Artwork-use_bezels", "1" },
+	{ "Artwork-artwork", "Artwork-use_overlays", "1" },
 
 };
 
@@ -99,13 +98,29 @@ typedef struct {
 _combo_link combo_links[] = {
 	{ "Video-frameskip", "0:1:2:3:4:5:6:7:8:9:10:11:12" },
 	{ "Video-bpp", "0:8:15:16:32" },
-	{ "Video-effect", "none:scale2x:lq2x:hq2x:6tap2x:scan2:rgbscan:scan3:fakescan" },
+	{ "Video-effect", "0:1:2:3:4:5:6:7:8" },
 	{ "Artwork-artwork_resolution", "0:1:2" },
 	{ "Sound-samplefreq", "8000:11025:16000:22050:44100" },
 	{ "Sound-dsp_plugin", "oss:sdl:arts" },
 	{ "Sound-sound_mixer_plugin", "oss" },
 	{ "Vector-vectorres", "320x200:640x480:800x600:1024x768:1280x1024:1600x1200" },
 	{ "Input-joytype", "0:5" },
+	/* Defined in src/drivers/neogeo.c - we can either use the numbers below or 
+	   the reference to the bios (e.g. euro, japan, etc). These are listed
+	   here for reference:
+	   Europe, 1 Slot (also been seen on a 4 slot)	euro - sp-s2.sp1
+	   Europe, 4 Slot				euro-s1 - sp-s.sp1
+	   US, 2 Slot					us - usa_2slt.bin
+	   US, 6 Slot (V5?)				us-e - sp-e.sp1
+	   Asia S3 Ver 6				asia - asia-s3.rom
+	   Japan, Ver 6 VS Bios				japan - vs-bios.rom
+	   Japan, Older					japan-s2 - sp-j2.sp1
+	   Universe Bios v1.0 (hack)			uni-bios_1_0 - uni-bios_1_0.rom
+	   Universe Bios v1.1 (hack)			uni-bios_1_1 - uni-bios_1_1.rom
+	   Debug (Development) Bios			debug - neodebug.rom
+	   AES Console (Asia?) Bios			asia-aes - neo-epo.bin
+	   Universe Bios v1.2 (hack)			uni-bios_1_2 - uni-bios_1_2.rom
+	 */
 	{ "MAME-bios", "0:1:2:3:4:5:6:7:8:9:10:11" },
 };
 
@@ -193,6 +208,9 @@ get_property_value_as_string (GtkWidget *widget, gchar *key)
 		double_value = gtk_range_get_value (GTK_RANGE (widget));
 		text_value = g_strdup_printf ("%.2f", double_value);
 	} else if (GTK_IS_COMBO_BOX (widget)) {
+		/* Note that some options (e.g. effect) that are displayed using
+		   ComboBoxes are string options even though the value sent to MAME
+		   is an integer; MAME accepts the integer in quotes. */
 		gint idx;
 		gchar **values_arr;
 		
@@ -353,10 +371,13 @@ parent_widget_clicked (GtkWidget *widget, gpointer user_data)
 			/* Set the state of the children based on the value of the parent */
 			gchar *parent_val = get_property_value_as_string (widget, key);
 
-			if (strcmp (parent_val, widget_relationships[i].relationship) == 0)
+			if (strcmp (parent_val, widget_relationships[i].relationship) == 0) {
 				gtk_widget_set_sensitive (child, TRUE);
-			else
+				/* FIXME TODO Also turn off the option */
+			} else {
 				gtk_widget_set_sensitive (child, FALSE);
+				/* FIXME TODO Also turn on the option */
+			}
 		}
 	}
 }
@@ -455,6 +476,7 @@ connect_prop_to_object (MameOptionsLegacyDialog *dlg, GtkWidget *object, const g
 {
 	guint i;
 	int int_value;
+	gdouble dbl_value;
 	gchar *value;
 	
 	if (GTK_IS_TOGGLE_BUTTON (object))
@@ -462,12 +484,15 @@ connect_prop_to_object (MameOptionsLegacyDialog *dlg, GtkWidget *object, const g
 		int_value = mame_legacy_options_get_bool (main_gui.legacy_options, key);
 		value = g_strdup_printf ("%d", int_value);
 		set_property_value_as_string (object, value);
+		g_free (value);
 	} else if (GTK_IS_SPIN_BUTTON (object)) {
 		int_value = mame_legacy_options_get_int (main_gui.legacy_options, key);
 		value = g_strdup_printf ("%d", int_value);
 		set_property_value_as_string (object, value);
+		g_free (value);
 	} else if (GTK_IS_HSCALE (object)) {
-		value = mame_legacy_options_get (main_gui.legacy_options, key);
+		dbl_value = mame_legacy_options_get_dbl (main_gui.legacy_options, key);
+		value = g_strdup_printf ("%f", dbl_value);
 		set_property_value_as_string (object, value);
 		g_free (value);
 	} else if (GTK_IS_COMBO_BOX (object)) {
diff --git a/src/mame_options_legacy_dialog.h b/src/mame_options_legacy_dialog.h
index 4c49020..32c22ef 100644
--- a/src/mame_options_legacy_dialog.h
+++ b/src/mame_options_legacy_dialog.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/mameio.c b/src/mameio.c
index 7b53598..8e37df4 100644
--- a/src/mameio.c
+++ b/src/mameio.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/network_game.c b/src/network_game.c
index 3b365e0..dbd849d 100644
--- a/src/network_game.c
+++ b/src/network_game.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/network_game.h b/src/network_game.h
index 109a30d..5d92194 100644
--- a/src/network_game.h
+++ b/src/network_game.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/options_string.c b/src/options_string.c
index 6ae9292..578259e 100644
--- a/src/options_string.c
+++ b/src/options_string.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/options_string.h b/src/options_string.h
index 1d95880..d2f692f 100644
--- a/src/options_string.h
+++ b/src/options_string.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/progression_window.c b/src/progression_window.c
index 682aafd..b232a8a 100644
--- a/src/progression_window.c
+++ b/src/progression_window.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/progression_window.h b/src/progression_window.h
index 791a528..edd3f8b 100644
--- a/src/progression_window.h
+++ b/src/progression_window.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/rom_entry.c b/src/rom_entry.c
index 26adf8b..baca70f 100644
--- a/src/rom_entry.c
+++ b/src/rom_entry.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/rom_entry.h b/src/rom_entry.h
index b05e19f..4302837 100644
--- a/src/rom_entry.h
+++ b/src/rom_entry.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/src/unzip.c b/src/unzip.c
deleted file mode 100644
index 4aa2af3..0000000
--- a/src/unzip.c
+++ /dev/null
@@ -1,613 +0,0 @@
-#include "common.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <zlib.h>
-#include "unzip.h"
-
-#define ERROR_CORRUPT "The zipfile seems to be corrupt, please check it"
-#define ERROR_FILESYSTEM "Your filesystem seems to be corrupt, please check it"
-#define ERROR_UNSUPPORTED "The format of this zipfile is not supported, please recompress it"
-
-#define INFLATE_INPUT_BUFFER_MAX 16384
-#ifndef MIN
-#define MIN(x,y) ((x)<(y)?(x):(y))
-#endif
-
-/* Read compressed data from a zip entry
-   in:
-     zip opened zip
-     ent entry to read
-   out:
-     data buffer for data, ent.compressed_size UINT8s allocated by the caller
-   return:
-     ==0 success
-     <0 error
-*/
-static int readcompresszip(ZIP* zip, struct zipent* ent, char* data);
-
-/* Read decompressed data from a zip entry
-   in:
-     zip zip stream open
-     ent entry to read
-   out:
-     data buffer for data, ent.uncompressed_size UINT8s allocated by the caller
-   return:
-     ==0 success
-     <0 error
-*/
-static int readuncompresszip(ZIP* zip, struct zipent* ent, char* data);
-
-/* Print a error message */
-static void errormsg(const char* extmsg, const char* usermsg, const char* zipname) {
-	GMAMEUI_DEBUG("Error in zipfile %s: %s\n%s", zipname, usermsg, extmsg);
-}
-
-/* -------------------------------------------------------------------------
-   Unzip support
- ------------------------------------------------------------------------- */
-
-/* Use these to avoid structure padding and byte-ordering problems */
-static UINT16 read_word (char *buf) {
-   unsigned char *ubuf = (unsigned char *) buf;
-
-   return ((UINT16)ubuf[1] << 8) | (UINT16)ubuf[0];
-}
-
-/* Use these to avoid structure padding and byte-ordering problems */
-static UINT32 read_dword (char *buf) {
-   unsigned char *ubuf = (unsigned char *) buf;
-
-   return ((UINT32)ubuf[3] << 24) | ((UINT32)ubuf[2] << 16) | ((UINT32)ubuf[1] << 8) | (UINT32)ubuf[0];
-}
-
-/* Locate end-of-central-dir sig in buffer and return offset
-   out:
-	*offset offset of cent dir start in buffer
-   return:
-	==0 not found
-	!=0 found, *offset valid
-*/
-static int ecd_find_sig (char *buffer, int buflen, int *offset)
-{
-	static char ecdsig[] = { 'P', 'K', 0x05, 0x06 };
-	int i;
-	for (i=buflen-22; i>=0; i--) {
-		if (memcmp(buffer+i, ecdsig, 4) == 0) {
-			*offset = i;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-/* Read ecd data in zip structure
-   in:
-     zip->fp, zip->length zip file
-   out:
-     zip->ecd, zip->ecd_length ecd data
-*/
-static int ecd_read(ZIP* zip) {
-	char* buf;
-	int buf_length = 1024; /* initial buffer length */
-
-	while (1) {
-		int offset;
-
-		if (buf_length > zip->length)
-			buf_length = zip->length;
-
-		if (fseek(zip->fp, zip->length - buf_length, SEEK_SET) != 0) {
-			return -1;
-		}
-
-		/* allocate buffer */
-		buf = (char*)malloc( buf_length );
-		if (!buf) {
-			return -1;
-		}
-
-		if (fread( buf, buf_length, 1, zip->fp ) != 1) {
-			free(buf);
-			return -1;
-		}
-
-		if (ecd_find_sig(buf, buf_length, &offset)) {
-			zip->ecd_length = buf_length - offset;
-
-			zip->ecd = (char*)malloc( zip->ecd_length );
-			if (!zip->ecd) {
-				free(buf);
-				return -1;
-			}
-
-			memcpy(zip->ecd, buf + offset, zip->ecd_length);
-
-			free(buf);
-			return 0;
-		}
-
-		free(buf);
-
-		if (buf_length < zip->length) {
-			/* double buffer */
-			buf_length = 2*buf_length;
-
-			GMAMEUI_DEBUG("Retry reading of zip ecd for %d bytes",buf_length);
-
-		} else {
-			return -1;
-		}
-	}
-}
-
-/* offsets in end of central directory structure */
-#define ZIPESIG		0x00
-#define ZIPEDSK		0x04
-#define ZIPECEN		0x06
-#define ZIPENUM		0x08
-#define ZIPECENN	0x0a
-#define ZIPECSZ		0x0c
-#define ZIPEOFST	0x10
-#define ZIPECOML	0x14
-#define ZIPECOM		0x16
-
-/* offsets in central directory entry structure */
-#define ZIPCENSIG	0x0
-#define ZIPCVER		0x4
-#define ZIPCOS		0x5
-#define	ZIPCVXT		0x6
-#define	ZIPCEXOS	0x7
-#define ZIPCFLG		0x8
-#define ZIPCMTHD	0xa
-#define ZIPCTIM		0xc
-#define ZIPCDAT		0xe
-#define ZIPCCRC		0x10
-#define ZIPCSIZ		0x14
-#define ZIPCUNC		0x18
-#define ZIPCFNL		0x1c
-#define ZIPCXTL		0x1e
-#define ZIPCCML		0x20
-#define ZIPDSK		0x22
-#define ZIPINT		0x24
-#define ZIPEXT		0x26
-#define ZIPOFST		0x2a
-#define ZIPCFN		0x2e
-
-/* offsets in local file header structure */
-#define ZIPLOCSIG	0x00
-#define ZIPVER		0x04
-#define ZIPGENFLG	0x06
-#define ZIPMTHD		0x08
-#define ZIPTIME		0x0a
-#define ZIPDATE		0x0c
-#define ZIPCRC		0x0e
-#define ZIPSIZE		0x12
-#define ZIPUNCMP	0x16
-#define ZIPFNLN		0x1a
-#define ZIPXTRALN	0x1c
-#define ZIPNAME		0x1e
-
-/* Opens a zip stream for reading
-   return:
-     !=0 success, zip stream
-     ==0 error
-*/
-ZIP* openzip(const char* zipfile) {
-	ZIP* zip;
-	FILE *file_ptr;
-
-	file_ptr = fopen(zipfile, "rb"); /* open */
-
-	if(!file_ptr)
-		return 0;
-
-	zip = (ZIP*)malloc( sizeof(ZIP) );
-	if (!zip) {
-		return 0;
-	}
-
-	zip->fp = file_ptr; /* set file pointer */
-	
-	/* go to end */
-	if (fseek(zip->fp, 0L, SEEK_END) != 0) {
-		errormsg ("Seeking to end", ERROR_FILESYSTEM, zipfile);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-
-	/* get length */
-	zip->length = ftell(zip->fp);
-	if (zip->length < 0) {
-		errormsg ("Get file size", ERROR_FILESYSTEM, zipfile);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-	if (zip->length == 0) {
-		errormsg ("Empty file", ERROR_CORRUPT, zipfile);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-
-	/* read ecd data */
-	if (ecd_read(zip)!=0) {
-		errormsg ("Reading ECD (end of central directory)", ERROR_CORRUPT, zipfile);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-
-	/* compile ecd info */
-	zip->end_of_cent_dir_sig = read_dword (zip->ecd+ZIPESIG);
-	zip->number_of_this_disk = read_word (zip->ecd+ZIPEDSK);
-	zip->number_of_disk_start_cent_dir = read_word (zip->ecd+ZIPECEN);
-	zip->total_entries_cent_dir_this_disk = read_word (zip->ecd+ZIPENUM);
-	zip->total_entries_cent_dir = read_word (zip->ecd+ZIPECENN);
-	zip->size_of_cent_dir = read_dword (zip->ecd+ZIPECSZ);
-	zip->offset_to_start_of_cent_dir = read_dword (zip->ecd+ZIPEOFST);
-	zip->zipfile_comment_length = read_word (zip->ecd+ZIPECOML);
-	zip->zipfile_comment = zip->ecd+ZIPECOM;
-
-	/* verify that we can work with this zipfile (no disk spanning allowed) */
-	if ((zip->number_of_this_disk != zip->number_of_disk_start_cent_dir) ||
-		(zip->total_entries_cent_dir_this_disk != zip->total_entries_cent_dir) ||
-		(zip->total_entries_cent_dir < 1)) {
-		errormsg("Cannot span disks", ERROR_UNSUPPORTED, zipfile);
-		free(zip->ecd);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-
-	if (fseek(zip->fp, zip->offset_to_start_of_cent_dir, SEEK_SET)!=0) {
-		errormsg ("Seeking to central directory", ERROR_CORRUPT, zipfile);
-		free(zip->ecd);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-
-	/* read from start of central directory */
-	zip->cd = (char*)malloc( zip->size_of_cent_dir );
-	if (!zip->cd) {
-		free(zip->ecd);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-
-	if (fread(zip->cd, zip->size_of_cent_dir, 1, zip->fp)!=1) {
-		errormsg ("Reading central directory", ERROR_CORRUPT, zipfile);
-		free(zip->cd);
-		free(zip->ecd);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-
-	/* reset ent */
-	zip->ent.name = 0;
-
-	/* rewind */
-	zip->cd_pos = 0;
-
-	/* file name */
-	zip->zip = (char*)malloc(strlen(zipfile)+1);
-	if (!zip->zip) {
-		free(zip->cd);
-		free(zip->ecd);
-		fclose(zip->fp);
-		free(zip);
-		return 0;
-	}
-	strcpy(zip->zip, zipfile);
-
-	return zip;
-}
-
-/* Reads the current entry from a zip stream
-   in:
-     zip opened zip
-   return:
-     !=0 success
-     ==0 error
-*/
-struct zipent* readzip(ZIP* zip) {
-
-	/* end of directory */
-	if (zip->cd_pos >= zip->size_of_cent_dir)
-		return 0;
-
-	/* compile zipent info */
-	zip->ent.cent_file_header_sig = read_dword (zip->cd+zip->cd_pos+ZIPCENSIG);
-	zip->ent.version_made_by = *(zip->cd+zip->cd_pos+ZIPCVER);
-	zip->ent.host_os = *(zip->cd+zip->cd_pos+ZIPCOS);
-	zip->ent.version_needed_to_extract = *(zip->cd+zip->cd_pos+ZIPCVXT);
-	zip->ent.os_needed_to_extract = *(zip->cd+zip->cd_pos+ZIPCEXOS);
-	zip->ent.general_purpose_bit_flag = read_word (zip->cd+zip->cd_pos+ZIPCFLG);
-	zip->ent.compression_method = read_word (zip->cd+zip->cd_pos+ZIPCMTHD);
-	zip->ent.last_mod_file_time = read_word (zip->cd+zip->cd_pos+ZIPCTIM);
-	zip->ent.last_mod_file_date = read_word (zip->cd+zip->cd_pos+ZIPCDAT);
-	zip->ent.crc32 = read_dword (zip->cd+zip->cd_pos+ZIPCCRC);
-	zip->ent.compressed_size = read_dword (zip->cd+zip->cd_pos+ZIPCSIZ);
-	zip->ent.uncompressed_size = read_dword (zip->cd+zip->cd_pos+ZIPCUNC);
-	zip->ent.filename_length = read_word (zip->cd+zip->cd_pos+ZIPCFNL);
-	zip->ent.extra_field_length = read_word (zip->cd+zip->cd_pos+ZIPCXTL);
-	zip->ent.file_comment_length = read_word (zip->cd+zip->cd_pos+ZIPCCML);
-	zip->ent.disk_number_start = read_word (zip->cd+zip->cd_pos+ZIPDSK);
-	zip->ent.internal_file_attrib = read_word (zip->cd+zip->cd_pos+ZIPINT);
-	zip->ent.external_file_attrib = read_dword (zip->cd+zip->cd_pos+ZIPEXT);
-	zip->ent.offset_lcl_hdr_frm_frst_disk = read_dword (zip->cd+zip->cd_pos+ZIPOFST);
-
-    /* check to see if filename length is illegally long (past the size of this directory
-       entry) */
-    if (zip->cd_pos + ZIPCFN + zip->ent.filename_length > zip->size_of_cent_dir)
-    {
-        errormsg("Invalid filename length in directory", ERROR_CORRUPT,zip->zip);
-        return 0;
-    }
-
-	/* copy filename */
-	free(zip->ent.name);
-	zip->ent.name = (char*)malloc(zip->ent.filename_length + 1);
-	memcpy(zip->ent.name, zip->cd+zip->cd_pos+ZIPCFN, zip->ent.filename_length);
-	zip->ent.name[zip->ent.filename_length] = 0;
-
-	/* skip to next entry in central dir */
-	zip->cd_pos += ZIPCFN + zip->ent.filename_length + zip->ent.extra_field_length + zip->ent.file_comment_length;
-
-	return &zip->ent;
-}
-
-/* Closes a zip stream */
-void closezip(ZIP* zip) {
-	/* release all */
-	free(zip->ent.name);
-	free(zip->cd);
-	free(zip->ecd);
-	/* only if not suspended */
-	if (zip->fp)
-		fclose(zip->fp);
-	free(zip->zip);
-	free(zip);
-}
-
-/* Reset a zip stream to the first entry
-   in:
-     zip opened zip
-   note:
-     ZIP file must be opened and not suspended
-*/
-void rewindzip(ZIP* zip) {
-	zip->cd_pos = 0;
-}
-
-/* Seek zip->fp to compressed data
-   return:
-	==0 success
-	<0 error
-*/
-static int seekcompresszip(ZIP* zip, struct zipent* ent) {
-	char buf[ZIPNAME];
-	long offset;
-
-	if (fseek(zip->fp, ent->offset_lcl_hdr_frm_frst_disk, SEEK_SET)!=0) {
-		errormsg ("Seeking to header", ERROR_CORRUPT, zip->zip);
-		return -1;
-	}
-
-	if (fread(buf, ZIPNAME, 1, zip->fp)!=1) {
-		errormsg ("Reading header", ERROR_CORRUPT, zip->zip);
-		return -1;
-	}
-
-	{
-		UINT16 filename_length = read_word (buf+ZIPFNLN);
-		UINT16 extra_field_length = read_word (buf+ZIPXTRALN);
-
-		/* calculate offset to data and fseek() there */
-		offset = ent->offset_lcl_hdr_frm_frst_disk + ZIPNAME + filename_length + extra_field_length;
-
-		if (fseek(zip->fp, offset, SEEK_SET) != 0) {
-			errormsg ("Seeking to compressed data", ERROR_CORRUPT, zip->zip);
-			return -1;
-		}
-
-	}
-
-	return 0;
-}
-
-/* Inflate a file
-   in:
-   in_file stream to inflate
-   in_size size of the compressed data to read
-   out_size size of decompressed data
-   out:
-   out_data buffer for decompressed data
-   return:
-   ==0 ok
-
-   990525 rewritten for use with zlib MLR
-*/
-static int inflate_file(FILE* in_file, unsigned in_size, unsigned char* out_data, unsigned out_size)
-{
-    int err;
-	unsigned char* in_buffer;
-    z_stream d_stream; /* decompression stream */
-
-    d_stream.zalloc = 0;
-    d_stream.zfree = 0;
-    d_stream.opaque = 0;
-
-	d_stream.next_in  = 0;
-	d_stream.avail_in = 0;
-    d_stream.next_out = out_data;
-    d_stream.avail_out = out_size;
-
-    err = inflateInit2(&d_stream, -MAX_WBITS);
-	/* windowBits is passed < 0 to tell that there is no zlib header.
-	 * Note that in this case inflate *requires* an extra "dummy" byte
-	 * after the compressed stream in order to complete decompression and
-	 * return Z_STREAM_END.
-	 */
-    if (err != Z_OK)
-	{
-		GMAMEUI_DEBUG("inflateInit error: %d", err);
-        return -1;
-	}
-
-	in_buffer = (unsigned char*)malloc(INFLATE_INPUT_BUFFER_MAX+1);
-	if (!in_buffer)
-		return -1;
-
-    for (;;)
-	{
-		if (in_size <= 0)
-		{
-			GMAMEUI_DEBUG("inflate error: compressed size too small");
-			free (in_buffer);
-			return -1;
-		}
-		d_stream.next_in  = in_buffer;
-		d_stream.avail_in = fread (in_buffer, 1, MIN(in_size, INFLATE_INPUT_BUFFER_MAX), in_file);
-		in_size -= d_stream.avail_in;
-		if (in_size == 0)
-			d_stream.avail_in++; /* add dummy byte at end of compressed data */
-
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END)
-			break;
-		if (err != Z_OK)
-		{
-			GMAMEUI_DEBUG("inflate error: %d", err);
-			free (in_buffer);
-			return -1;
-		}
-    }
-
-    err = inflateEnd(&d_stream);
-	if (err != Z_OK)
-	{
-		GMAMEUI_DEBUG("inflateEnd error: %d", err);
-		free (in_buffer);
-		return -1;
-	}
-
-	free (in_buffer);
-
-	if ((d_stream.avail_out > 0) || (in_size > 0))
-	{
-		GMAMEUI_DEBUG("zip size mismatch. %i", in_size);
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Read compressed data
-   out:
-	data compressed data read
-   return:
-	==0 success
-	<0 error
-*/
-static int readcompresszip(ZIP* zip, struct zipent* ent, char* data) {
-	int err = seekcompresszip(zip,ent);
-	if (err!=0)
-		return err;
-
-	if (fread(data, ent->compressed_size, 1, zip->fp)!=1) {
-		errormsg ("Reading compressed data", ERROR_CORRUPT, zip->zip);
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Read UNcompressed data
-   out:
-	data UNcompressed data
-   return:
-	==0 success
-	<0 error
-*/
-static int readuncompresszip(ZIP* zip, struct zipent* ent, char* data) {
-	if (ent->compression_method == 0x0000) {
-		/* file is not compressed, simply stored */
-
-		/* check if size are equal */
-		if (ent->compressed_size != ent->uncompressed_size) {
-			errormsg("Wrong uncompressed size in store compression", ERROR_CORRUPT,zip->zip);
-			return -3;
-		}
-
-		return readcompresszip(zip,ent,data);
-	} else if (ent->compression_method == 0x0008) {
-		/* file is compressed using "Deflate" method */
-		if (ent->version_needed_to_extract > 0x14) {
-			errormsg("Version too new", ERROR_UNSUPPORTED,zip->zip);
-			return -2;
-		}
-
-		if (ent->os_needed_to_extract != 0x00) {
-			errormsg("OS not supported", ERROR_UNSUPPORTED,zip->zip);
-			return -2;
-		}
-
-		if (ent->disk_number_start != zip->number_of_this_disk) {
-			errormsg("Cannot span disks", ERROR_UNSUPPORTED,zip->zip);
-			return -2;
-		}
-
-		/* read compressed data */
-		if (seekcompresszip(zip,ent)!=0) {
-			return -1;
-		}
-
-		/* configure inflate */
-		if (inflate_file( zip->fp, ent->compressed_size, (unsigned char*)data, ent->uncompressed_size))
-		{
-			errormsg("Inflating compressed data", ERROR_CORRUPT, zip->zip);
-			return -3;
-		}
-
-		return 0;
-	} else {
-		errormsg("Compression method unsupported", ERROR_UNSUPPORTED, zip->zip);
-		return -2;
-	}
-}
-
-char *read_zipentry(ZIP* zip, struct zipent* ent)
-{
-	char *data;
-
-	if (!zip || !ent)
-		return NULL;
-
-	data = (char*) g_malloc(ent->uncompressed_size);
-	if(!data)
-	{
-		GMAMEUI_DEBUG("%s: out of memory!",ent->name);
-		return NULL;
-	}
-	if (!ent->compressed_size)
-	{
-		g_free(data);
-		return NULL;
-	}	
-
-	if (readuncompresszip(zip, ent, data) != 0)
-	{
-		g_free(data);
-		GMAMEUI_DEBUG("Error while uncompressing %s ",ent->name);
-		return NULL;
-	}
-	return data;
-}
diff --git a/src/unzip.h b/src/unzip.h
deleted file mode 100644
index 9b56c4f..0000000
--- a/src/unzip.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef __UNZIP_H
-#define __UNZIP_H
-
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* not defined anywhere else */
-typedef signed char	INT8;
-typedef signed short	INT16;
-typedef signed int	INT32;
-typedef unsigned char	UINT8;
-typedef unsigned short	UINT16;
-typedef unsigned int	UINT32;
-/***************************************************************************
- * Support for retrieving files from zipfiles
- ***************************************************************************/
-
-struct zipent {
-	UINT32	cent_file_header_sig;
-	UINT8	version_made_by;
-	UINT8	host_os;
-	UINT8	version_needed_to_extract;
-	UINT8	os_needed_to_extract;
-	UINT16	general_purpose_bit_flag;
-	UINT16	compression_method;
-	UINT16	last_mod_file_time;
-	UINT16	last_mod_file_date;
-	UINT32	crc32;
-	UINT32	compressed_size;
-	UINT32	uncompressed_size;
-	UINT16	filename_length;
-	UINT16	extra_field_length;
-	UINT16	file_comment_length;
-	UINT16	disk_number_start;
-	UINT16	internal_file_attrib;
-	UINT32	external_file_attrib;
-	UINT32	offset_lcl_hdr_frm_frst_disk;
-	char*   name; /* 0 terminated */
-};
-
-typedef struct {
-	char* zip; /* zip name */
-	FILE* fp; /* zip handler */
-	long length; /* length of zip file */
-
-	char* ecd; /* end_of_cent_dir data */
-	unsigned ecd_length; /* end_of_cent_dir length */
-
-	char* cd; /* cent_dir data */
-
-	unsigned cd_pos; /* position in cent_dir */
-
-	struct zipent ent; /* buffer for readzip */
-
-	/* end_of_cent_dir */
-	UINT32	end_of_cent_dir_sig;
-	UINT16	number_of_this_disk;
-	UINT16	number_of_disk_start_cent_dir;
-	UINT16	total_entries_cent_dir_this_disk;
-	UINT16	total_entries_cent_dir;
-	UINT32	size_of_cent_dir;
-	UINT32	offset_to_start_of_cent_dir;
-	UINT16	zipfile_comment_length;
-	char*	zipfile_comment; /* pointer in ecd */
-} ZIP;
-
-/* Opens a zip stream for reading
-   return:
-     !=0 success, zip stream
-     ==0 error
-*/
-ZIP* openzip(const char* path);
-
-/* Closes a zip stream */
-void closezip(ZIP* zip);
-
-/* Reads the current entry from a zip stream
-   in:
-     zip opened zip
-   return:
-     !=0 success
-     ==0 error
-*/
-struct zipent* readzip(ZIP* zip);
-
-/* Resets a zip stream to the first entry
-   in:
-     zip opened zip
-   note:
-     ZIP file must be opened and not suspended
-*/
-void rewindzip(ZIP* zip);
-
-/* Reads a zipentry
-* returns the entry or NULL if anything went wrong.
-* Returns: a char buffer allocated with g_malloc.
-*/
-char *read_zipentry(ZIP* zip, struct zipent* ent);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/xmame_options.c b/src/xmame_options.c
index 64603db..3db7466 100644
--- a/src/xmame_options.c
+++ b/src/xmame_options.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -38,6 +37,8 @@ xmame_options_free (void)
 	g_hash_table_destroy (option_map);
 }
 
+/* This function sets up all the options that are supported by MAME; options
+   supported by each version of MAME are parsed in mame_get_options */
 void
 xmame_options_init (void)
 {
diff --git a/src/xmame_options.h b/src/xmame_options.h
index f871e29..919bbfb 100644
--- a/src/xmame_options.h
+++ b/src/xmame_options.h
@@ -7,7 +7,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
 

-- 
front-end for the arcade games emulator MAME



More information about the Pkg-games-commits mailing list