.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81327 e17a0e51-4ae3-4d35-97c3-1a29b211df97

13 files changed, 538 insertions, 538 deletions

diff --git a/gui/Gtk2Gui.c b/gui/GtkGui.c
index 15913b68..15913b68 100755..100644
--- a/gui/Gtk2Gui.c
+++ b/gui/GtkGui.c
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 07823a5b..040d53e9 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -14,7 +14,7 @@ pcsxr_SOURCES = \
 	nopic.h		\
 	Plugin.c	\
 	Config.c	\
-	Gtk2Gui.c	\
+	GtkGui.c	\
 	MemcardDlg.c	\
 	MemcardDlg.h	\
 	ConfDlg.c	\
diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
index 55016cb0..bb8a48b9 100644
--- a/plugins/dfinput/Makefile.am
+++ b/plugins/dfinput/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-I../../include -I../../libpcsxcore $(SDL_CFLAGS)
 
 bin_PROGRAMS = cfgDFInput
-cfgDFInput_SOURCES = cfg-gtk2.c pad.h
+cfgDFInput_SOURCES = cfg-gtk.c pad.h
 cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL_LIBS) -lX11
 
 glade_DATA = dfinput.ui
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk.c
index 941d7848..941d7848 100755..100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f01dd7d..25c36002 100755
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,7 @@ gui/ConfDlg.h
 gui/Config.c
 gui/DebugMemory.c
 gui/DebugMemory.h
-gui/Gtk2Gui.c
+gui/GtkGui.c
 gui/Linux.h
 gui/LnxMain.c
 gui/MemcardDlg.c
@@ -46,7 +46,7 @@ plugins/dfcdrom/cdr-null.c
 plugins/dfcdrom/cfg.c
 plugins/dfinput/analog.c
 plugins/dfinput/cfg.c
-plugins/dfinput/cfg-gtk2.c
+plugins/dfinput/cfg-gtk.c
 [type: gettext/glade]plugins/dfinput/dfinput.ui
 plugins/dfinput/pad.c
 plugins/dfinput/sdljoy.c
diff --git a/po/fr_FR.po b/po/fr_FR.po
index e26710a9..d7773da9 100755
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -558,7 +558,7 @@ msgstr "Ouvrir un fichier de codes"
 msgid "PCSXR Cheat Code Files (*.cht)"
 msgstr "Codes de triche PCSXR (*.cht)"
 
-#: ../gui/Cheat.c:309 ../gui/Gtk2Gui.c:475 ../gui/Gtk2Gui.c:616
+#: ../gui/Cheat.c:309 ../gui/GtkGui.c:475 ../gui/GtkGui.c:616
 #: ../win32/gui/WndMain.c:1464 ../win32/gui/WndMain.c:1545
 msgid "All Files"
 msgstr "Tous les fichiers"
@@ -698,91 +698,91 @@ msgstr "Adresse"
 msgid "Text"
 msgstr "Texte"
 
-#: ../gui/Gtk2Gui.c:139
+#: ../gui/GtkGui.c:139
 msgid "Ready"
 msgstr "Prêt"
 
-#: ../gui/Gtk2Gui.c:180
+#: ../gui/GtkGui.c:180
 msgid "Emulation Paused."
 msgstr "Émulation en pause."
 
-#: ../gui/Gtk2Gui.c:458
+#: ../gui/GtkGui.c:458
 msgid "Select PSX EXE File"
 msgstr "Sélectionner un fichier EXE PSX"
 
-#: ../gui/Gtk2Gui.c:471
+#: ../gui/GtkGui.c:471
 msgid "PlayStation Executable Files"
 msgstr "Fichiers exécutables PlayStation"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "Not a valid PSX file"
 msgstr "Ceci n'est pas un fichier PSX valide"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "Le fichier n'est pas un exécutable PlayStation valide"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692
 msgid "CD ROM failed"
 msgstr "Plantage du CD ROM"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692 ../win32/gui/WndMain.c:469
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692 ../win32/gui/WndMain.c:469
 #: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Ce CD n'est pas un CD de PlayStation valide"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703 ../win32/gui/WndMain.c:479
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703 ../win32/gui/WndMain.c:479
 #: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "Impossible de charger le CD-ROM !"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703
 msgid "The CD-ROM could not be loaded"
 msgstr "Le CD-ROM n'a pas pû être chargé"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Could not run BIOS"
 msgstr "Impossible de lancer le BIOS"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "Le lancement du BIOS n'est pas supporté en mode Internal HLE BIOS."
 
-#: ../gui/Gtk2Gui.c:591
+#: ../gui/GtkGui.c:591
 msgid "Open PSX Disc Image File"
 msgstr "Ouvrir une image de disque PSX"
 
-#: ../gui/Gtk2Gui.c:611
+#: ../gui/GtkGui.c:611
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "Images de disques PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:864
+#: ../gui/GtkGui.c:864
 #, c-format
 msgid "Loaded state %s."
 msgstr "État chargé %s."
 
-#: ../gui/Gtk2Gui.c:867
+#: ../gui/GtkGui.c:867
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Érreur lors du chargement de l'état %s !"
 
-#: ../gui/Gtk2Gui.c:878
+#: ../gui/GtkGui.c:878
 #, c-format
 msgid "Saved state %s."
 msgstr "État sauvé %s."
 
-#: ../gui/Gtk2Gui.c:880
+#: ../gui/GtkGui.c:880
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Érreur lors de l'enregistrement de l'état %s !"
 
-#: ../gui/Gtk2Gui.c:915 ../gui/Gtk2Gui.c:943
+#: ../gui/GtkGui.c:915 ../gui/GtkGui.c:943
 msgid "Select State File"
 msgstr "Sélectionner un fichier d'état"
 
-#: ../gui/Gtk2Gui.c:986
+#: ../gui/GtkGui.c:986
 msgid "Notice"
 msgstr ""
 
@@ -1303,183 +1303,183 @@ msgstr ""
 msgid "32min"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk.c:49
 msgid "D-Pad Up"
 msgstr "Pavé directionnel Haut"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk.c:50
 msgid "D-Pad Down"
 msgstr "Pavé directionnel Bas"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk.c:51
 msgid "D-Pad Left"
 msgstr "Pavé directionnel Gauche"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk.c:52
 msgid "D-Pad Right"
 msgstr "Pavé directionnel Droite"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk.c:53
 msgid "Cross"
 msgstr "Croix"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk.c:54
 msgid "Circle"
 msgstr "Rond"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk.c:55
 msgid "Square"
 msgstr "Carré"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk.c:56
 msgid "Triangle"
 msgstr "Triangle"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk.c:57
 msgid "L1"
 msgstr "L1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk.c:58
 msgid "R1"
 msgstr "R1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk.c:59
 msgid "L2"
 msgstr "L2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk.c:60
 msgid "R2"
 msgstr "R2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk.c:61
 msgid "Select"
 msgstr "Select"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk.c:62
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk.c:63
 msgid "L3"
 msgstr "L3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:64
+#: ../plugins/dfinput/cfg-gtk.c:64
 msgid "R3"
 msgstr "R3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:65
+#: ../plugins/dfinput/cfg-gtk.c:65
 #, fuzzy
 msgid "Analog"
 msgstr ""
 "Pavé digital\n"
 "Pavé analogique"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk.c:69
 msgid "L-Stick Right"
 msgstr "L-Stick Droite"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk.c:70
 msgid "L-Stick Left"
 msgstr "L-Stick Gauche"
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk.c:71
 msgid "L-Stick Down"
 msgstr "L-Stick Bas"
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk.c:72
 msgid "L-Stick Up"
 msgstr "L-Stick Haut"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk.c:73
 msgid "R-Stick Right"
 msgstr "R-Stick Droite"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk.c:74
 msgid "R-Stick Left"
 msgstr "R-Stick Gauche"
 
-#: ../plugins/dfinput/cfg-gtk2.c:75
+#: ../plugins/dfinput/cfg-gtk.c:75
 msgid "R-Stick Down"
 msgstr "R-Stick Bas"
 
-#: ../plugins/dfinput/cfg-gtk2.c:76
+#: ../plugins/dfinput/cfg-gtk.c:76
 msgid "R-Stick Up"
 msgstr "R-Stick Haut"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Centered"
 msgstr "Centré"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Up"
 msgstr "Haut"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Right"
 msgstr "Droite"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Rightup"
 msgstr "Droite-haut"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Down"
 msgstr "Bas"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Rightdown"
 msgstr "Droite-bas"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Left"
 msgstr "Gauche"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Leftup"
 msgstr "Gauche-haut"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
 msgid "Leftdown"
 msgstr "Gauche-bas"
 
-#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "Joystick : Bouton %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "Joystick: Axe %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "Joystick: Tête %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
 msgid "Keyboard:"
 msgstr "Clavier :"
 
-#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
 msgid "(Not Set)"
 msgstr "(Non défini)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:575
+#: ../plugins/dfinput/cfg-gtk.c:575
 #: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/dfinput/cfg-gtk2.c:623
+#: ../plugins/dfinput/cfg-gtk.c:623
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "Configuration clavier/manette"
 
-#: ../plugins/dfinput/cfg-gtk2.c:629 ../plugins/dfinput/cfg-gtk2.c:649
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
 msgid "Key"
 msgstr "Touche"
 
-#: ../plugins/dfinput/cfg-gtk2.c:635 ../plugins/dfinput/cfg-gtk2.c:655
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
 msgid "Button"
 msgstr "Bouton"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 7bc43183..6cf3ba4b 100755
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -570,7 +570,7 @@ msgstr "Csalás fájl megnyitása"
 msgid "PCSXR Cheat Code Files (*.cht)"
 msgstr "PCSXR csalás kód fájlok (*.cht)"
 
-#: ../gui/Cheat.c:309 ../gui/Gtk2Gui.c:475 ../gui/Gtk2Gui.c:616
+#: ../gui/Cheat.c:309 ../gui/GtkGui.c:475 ../gui/GtkGui.c:616
 #: ../win32/gui/WndMain.c:1464 ../win32/gui/WndMain.c:1545
 msgid "All Files"
 msgstr "Minden fájl"
@@ -710,91 +710,91 @@ msgstr "Címzés"
 msgid "Text"
 msgstr "Szöveg"
 
-#: ../gui/Gtk2Gui.c:139
+#: ../gui/GtkGui.c:139
 msgid "Ready"
 msgstr "Kész"
 
-#: ../gui/Gtk2Gui.c:180
+#: ../gui/GtkGui.c:180
 msgid "Emulation Paused."
 msgstr "Emuláció szüneteltetve."
 
-#: ../gui/Gtk2Gui.c:458
+#: ../gui/GtkGui.c:458
 msgid "Select PSX EXE File"
 msgstr "PSX EXE fájl választás"
 
-#: ../gui/Gtk2Gui.c:471
+#: ../gui/GtkGui.c:471
 msgid "PlayStation Executable Files"
 msgstr "PlayStation futtatható fájlok"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "Not a valid PSX file"
 msgstr "Nem megfelelő PSX fájl"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "A fájl nem tűnik PlayStation futtatható fájlnak"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692
 msgid "CD ROM failed"
 msgstr "CD ROM hiba"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692 ../win32/gui/WndMain.c:469
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692 ../win32/gui/WndMain.c:469
 #: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Úgy tűnik a CD lemez nem PlayStation CD formátum"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703 ../win32/gui/WndMain.c:479
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703 ../win32/gui/WndMain.c:479
 #: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "CD-ROM betöltése sikertelen!"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703
 msgid "The CD-ROM could not be loaded"
 msgstr "CD-ROM nem tölthető be"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Could not run BIOS"
 msgstr "BIOS nem futtatható"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "BIOS használata nem támogatott belső HLE BIOS esetén."
 
-#: ../gui/Gtk2Gui.c:591
+#: ../gui/GtkGui.c:591
 msgid "Open PSX Disc Image File"
 msgstr "PSX lemez képfájl megnyitása"
 
-#: ../gui/Gtk2Gui.c:611
+#: ../gui/GtkGui.c:611
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PSX képfájlok (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:864
+#: ../gui/GtkGui.c:864
 #, c-format
 msgid "Loaded state %s."
 msgstr "Betöltött állás %s."
 
-#: ../gui/Gtk2Gui.c:867
+#: ../gui/GtkGui.c:867
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Hiba a mentett állás betöltése közben %s!"
 
-#: ../gui/Gtk2Gui.c:878
+#: ../gui/GtkGui.c:878
 #, c-format
 msgid "Saved state %s."
 msgstr "Mentett állás %s."
 
-#: ../gui/Gtk2Gui.c:880
+#: ../gui/GtkGui.c:880
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Hiba az állás mentése közben %s!"
 
-#: ../gui/Gtk2Gui.c:915 ../gui/Gtk2Gui.c:943
+#: ../gui/GtkGui.c:915 ../gui/GtkGui.c:943
 msgid "Select State File"
 msgstr "Állás mentés választás"
 
-#: ../gui/Gtk2Gui.c:986
+#: ../gui/GtkGui.c:986
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1316,181 +1316,181 @@ msgstr ""
 msgid "32min"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk.c:49
 msgid "D-Pad Up"
 msgstr "Digitális FEL"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk.c:50
 msgid "D-Pad Down"
 msgstr "Digitális LE"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk.c:51
 msgid "D-Pad Left"
 msgstr "Digitális BALRA"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk.c:52
 msgid "D-Pad Right"
 msgstr "Digitális JOBBRA"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk.c:53
 msgid "Cross"
 msgstr "KERESZT"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk.c:54
 msgid "Circle"
 msgstr "KÖR"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk.c:55
 msgid "Square"
 msgstr "NÉGYSZÖG"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk.c:56
 msgid "Triangle"
 msgstr "HÁROMSZÖG"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk.c:57
 msgid "L1"
 msgstr "L1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk.c:58
 msgid "R1"
 msgstr "R1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk.c:59
 msgid "L2"
 msgstr "L2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk.c:60
 msgid "R2"
 msgstr "R2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk.c:61
 msgid "Select"
 msgstr "Select"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk.c:62
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk.c:63
 msgid "L3"
 msgstr "L3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:64
+#: ../plugins/dfinput/cfg-gtk.c:64
 msgid "R3"
 msgstr "R3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:65
+#: ../plugins/dfinput/cfg-gtk.c:65
 #, fuzzy
 msgid "Analog"
 msgstr "Analóg irányító"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk.c:69
 msgid "L-Stick Right"
 msgstr "Bal kar jobbra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk.c:70
 msgid "L-Stick Left"
 msgstr "Bal kar jobbra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk.c:71
 msgid "L-Stick Down"
 msgstr "Bal kar le"
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk.c:72
 msgid "L-Stick Up"
 msgstr "Bal kar fel"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk.c:73
 msgid "R-Stick Right"
 msgstr "Jobb kar jobbra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk.c:74
 msgid "R-Stick Left"
 msgstr "Jobb kar balra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:75
+#: ../plugins/dfinput/cfg-gtk.c:75
 msgid "R-Stick Down"
 msgstr "Jobb kar le"
 
-#: ../plugins/dfinput/cfg-gtk2.c:76
+#: ../plugins/dfinput/cfg-gtk.c:76
 msgid "R-Stick Up"
 msgstr "Jobb kar fel"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Centered"
 msgstr "Középen"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Up"
 msgstr "Fel"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Right"
 msgstr "Jobbra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Rightup"
 msgstr "Jobbra fel"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Down"
 msgstr "Le"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Rightdown"
 msgstr "Jobbra le"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Left"
 msgstr "Balra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Leftup"
 msgstr "Balra fel"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
 msgid "Leftdown"
 msgstr "Balra le"
 
-#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "Joystick: %d gomb"
 
-#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "Joystick: %d%c irány"
 
-#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "Joystick: %d %s hat"
 
-#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
 msgid "Keyboard:"
 msgstr "Billentyűzet:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
 msgid "(Not Set)"
 msgstr "(Nincs beállítva)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:575
+#: ../plugins/dfinput/cfg-gtk.c:575
 #: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
 msgid "None"
 msgstr "Nincs"
 
-#: ../plugins/dfinput/cfg-gtk2.c:623
+#: ../plugins/dfinput/cfg-gtk.c:623
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "Játékirányító/Billentyűzet bemeneti beállítás"
 
-#: ../plugins/dfinput/cfg-gtk2.c:629 ../plugins/dfinput/cfg-gtk2.c:649
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
 msgid "Key"
 msgstr "Billentyű"
 
-#: ../plugins/dfinput/cfg-gtk2.c:635 ../plugins/dfinput/cfg-gtk2.c:655
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
 msgid "Button"
 msgstr "Gomb"
 
diff --git a/po/it.po b/po/it.po
index 7093e52d..634ff466 100755
--- a/po/it.po
+++ b/po/it.po
@@ -574,7 +574,7 @@ msgstr "Apri il file del cheat"
 msgid "PCSXR Cheat Code Files (*.cht)"
 msgstr "File cheat di PCSXR (*.cht)"
 
-#: ../gui/Cheat.c:309 ../gui/Gtk2Gui.c:475 ../gui/Gtk2Gui.c:616
+#: ../gui/Cheat.c:309 ../gui/GtkGui.c:475 ../gui/GtkGui.c:616
 #: ../win32/gui/WndMain.c:1464 ../win32/gui/WndMain.c:1545
 msgid "All Files"
 msgstr "Tutti i file"
@@ -720,91 +720,91 @@ msgstr "Indirizzo:"
 msgid "Text"
 msgstr "Strutture"
 
-#: ../gui/Gtk2Gui.c:139
+#: ../gui/GtkGui.c:139
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../gui/Gtk2Gui.c:180
+#: ../gui/GtkGui.c:180
 msgid "Emulation Paused."
 msgstr "L'emulazione è stata messa in pausa."
 
-#: ../gui/Gtk2Gui.c:458
+#: ../gui/GtkGui.c:458
 msgid "Select PSX EXE File"
 msgstr "Seleziona un file EXE della PSX"
 
-#: ../gui/Gtk2Gui.c:471
+#: ../gui/GtkGui.c:471
 msgid "PlayStation Executable Files"
 msgstr "File eseguibili della PlayStation"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "Not a valid PSX file"
 msgstr "Non è un file valido della PSX"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "Il file non sembra essere un eseguibile valido della Playstation"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692
 msgid "CD ROM failed"
 msgstr "Si è verificato un problema con il CD ROM"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692 ../win32/gui/WndMain.c:469
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692 ../win32/gui/WndMain.c:469
 #: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Il CD inserito non sembra essere un valido CD della Playstation"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703 ../win32/gui/WndMain.c:479
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703 ../win32/gui/WndMain.c:479
 #: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "Impossibile caricare il CD-ROM!"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703
 msgid "The CD-ROM could not be loaded"
 msgstr "Impossibile caricare il CD-ROM"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Could not run BIOS"
 msgstr "Impossibile avviare il BIOS"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "L'avvio del BIOS non è supportato con il BIOS HLE interno."
 
-#: ../gui/Gtk2Gui.c:591
+#: ../gui/GtkGui.c:591
 msgid "Open PSX Disc Image File"
 msgstr "Apri il file immagine del disco PSX"
 
-#: ../gui/Gtk2Gui.c:611
+#: ../gui/GtkGui.c:611
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "File immagine PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:864
+#: ../gui/GtkGui.c:864
 #, c-format
 msgid "Loaded state %s."
 msgstr "È stato caricato lo stato %s."
 
-#: ../gui/Gtk2Gui.c:867
+#: ../gui/GtkGui.c:867
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Si è verificato un errore durante il caricamento dello stato %s!"
 
-#: ../gui/Gtk2Gui.c:878
+#: ../gui/GtkGui.c:878
 #, c-format
 msgid "Saved state %s."
 msgstr "È stato salvato lo stato %s."
 
-#: ../gui/Gtk2Gui.c:880
+#: ../gui/GtkGui.c:880
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
 
-#: ../gui/Gtk2Gui.c:915 ../gui/Gtk2Gui.c:943
+#: ../gui/GtkGui.c:915 ../gui/GtkGui.c:943
 msgid "Select State File"
 msgstr "Seleziona il file dello stato"
 
-#: ../gui/Gtk2Gui.c:986
+#: ../gui/GtkGui.c:986
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1342,183 +1342,183 @@ msgstr ""
 msgid "32min"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk.c:49
 msgid "D-Pad Up"
 msgstr "D-Pad Su"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk.c:50
 msgid "D-Pad Down"
 msgstr "D-Pad Giù"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk.c:51
 msgid "D-Pad Left"
 msgstr "D-Pad Sinistra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk.c:52
 msgid "D-Pad Right"
 msgstr "D-Pad Destra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk.c:53
 msgid "Cross"
 msgstr "Croce"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk.c:54
 msgid "Circle"
 msgstr "Cerchio"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk.c:55
 msgid "Square"
 msgstr "Quadrato"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk.c:56
 msgid "Triangle"
 msgstr "Triangolo"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk.c:57
 msgid "L1"
 msgstr "L1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk.c:58
 msgid "R1"
 msgstr "R1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk.c:59
 msgid "L2"
 msgstr "L2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk.c:60
 msgid "R2"
 msgstr "R2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk.c:61
 msgid "Select"
 msgstr "Tasto Select"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk.c:62
 msgid "Start"
 msgstr "Tasto Start"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk.c:63
 msgid "L3"
 msgstr "L3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:64
+#: ../plugins/dfinput/cfg-gtk.c:64
 msgid "R3"
 msgstr "R3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:65
+#: ../plugins/dfinput/cfg-gtk.c:65
 #, fuzzy
 msgid "Analog"
 msgstr ""
 "Pad digitale\n"
 "Pad analogico"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk.c:69
 msgid "L-Stick Right"
 msgstr "L-Stick Destra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk.c:70
 msgid "L-Stick Left"
 msgstr "L-Stick Sinistra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk.c:71
 msgid "L-Stick Down"
 msgstr "L-Stick Giù"
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk.c:72
 msgid "L-Stick Up"
 msgstr "L-Stick Su"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk.c:73
 msgid "R-Stick Right"
 msgstr "R-Stick Destra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk.c:74
 msgid "R-Stick Left"
 msgstr "R-Stick Sinistra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:75
+#: ../plugins/dfinput/cfg-gtk.c:75
 msgid "R-Stick Down"
 msgstr "R-Stick Giù"
 
-#: ../plugins/dfinput/cfg-gtk2.c:76
+#: ../plugins/dfinput/cfg-gtk.c:76
 msgid "R-Stick Up"
 msgstr "R-Stick Su"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Centered"
 msgstr "Centrato"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Up"
 msgstr "Su"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Right"
 msgstr "Destra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Rightup"
 msgstr "In alto a destra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Down"
 msgstr "Giù"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Rightdown"
 msgstr "In basso a destra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Left"
 msgstr "Sinistra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Leftup"
 msgstr "In alto a sinistra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
 msgid "Leftdown"
 msgstr "In basso a sinistra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "Joystick: Pulsante %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "Joystick: Asse %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "Joystick: hat %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
 msgid "Keyboard:"
 msgstr "Tastiera:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
 msgid "(Not Set)"
 msgstr "(Nessuna impostazione)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:575
+#: ../plugins/dfinput/cfg-gtk.c:575
 #: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
 msgid "None"
 msgstr "Nessuno"
 
-#: ../plugins/dfinput/cfg-gtk2.c:623
+#: ../plugins/dfinput/cfg-gtk.c:623
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "Configurazione input del gamepad/tastiera"
 
-#: ../plugins/dfinput/cfg-gtk2.c:629 ../plugins/dfinput/cfg-gtk2.c:649
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
 msgid "Key"
 msgstr "Tasto"
 
-#: ../plugins/dfinput/cfg-gtk2.c:635 ../plugins/dfinput/cfg-gtk2.c:655
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
 msgid "Button"
 msgstr "Pulsante"
 
diff --git a/po/pcsxr.pot b/po/pcsxr.pot
index 5652a754..89eb7b0f 100755
--- a/po/pcsxr.pot
+++ b/po/pcsxr.pot
@@ -550,7 +550,7 @@ msgstr ""
 msgid "PCSXR Cheat Code Files (*.cht)"
 msgstr ""
 
-#: ../gui/Cheat.c:309 ../gui/Gtk2Gui.c:475 ../gui/Gtk2Gui.c:616
+#: ../gui/Cheat.c:309 ../gui/GtkGui.c:475 ../gui/GtkGui.c:616
 #: ../win32/gui/WndMain.c:1464 ../win32/gui/WndMain.c:1545
 msgid "All Files"
 msgstr ""
@@ -690,91 +690,91 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:139
+#: ../gui/GtkGui.c:139
 msgid "Ready"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:180
+#: ../gui/GtkGui.c:180
 msgid "Emulation Paused."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:458
+#: ../gui/GtkGui.c:458
 msgid "Select PSX EXE File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:471
+#: ../gui/GtkGui.c:471
 msgid "PlayStation Executable Files"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "Not a valid PSX file"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692
 msgid "CD ROM failed"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692 ../win32/gui/WndMain.c:469
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692 ../win32/gui/WndMain.c:469
 #: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703 ../win32/gui/WndMain.c:479
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703 ../win32/gui/WndMain.c:479
 #: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703
 msgid "The CD-ROM could not be loaded"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Could not run BIOS"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:591
+#: ../gui/GtkGui.c:591
 msgid "Open PSX Disc Image File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:611
+#: ../gui/GtkGui.c:611
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:864
+#: ../gui/GtkGui.c:864
 #, c-format
 msgid "Loaded state %s."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:867
+#: ../gui/GtkGui.c:867
 #, c-format
 msgid "Error loading state %s!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:878
+#: ../gui/GtkGui.c:878
 #, c-format
 msgid "Saved state %s."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:880
+#: ../gui/GtkGui.c:880
 #, c-format
 msgid "Error saving state %s!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:915 ../gui/Gtk2Gui.c:943
+#: ../gui/GtkGui.c:915 ../gui/GtkGui.c:943
 msgid "Select State File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:986
+#: ../gui/GtkGui.c:986
 msgid "Notice"
 msgstr ""
 
@@ -1272,180 +1272,180 @@ msgstr ""
 msgid "32min"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk.c:49
 msgid "D-Pad Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk.c:50
 msgid "D-Pad Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk.c:51
 msgid "D-Pad Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk.c:52
 msgid "D-Pad Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk.c:53
 msgid "Cross"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk.c:54
 msgid "Circle"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk.c:55
 msgid "Square"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk.c:56
 msgid "Triangle"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk.c:57
 msgid "L1"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk.c:58
 msgid "R1"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk.c:59
 msgid "L2"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk.c:60
 msgid "R2"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk.c:61
 msgid "Select"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk.c:62
 msgid "Start"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk.c:63
 msgid "L3"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:64
+#: ../plugins/dfinput/cfg-gtk.c:64
 msgid "R3"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:65
+#: ../plugins/dfinput/cfg-gtk.c:65
 msgid "Analog"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk.c:69
 msgid "L-Stick Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk.c:70
 msgid "L-Stick Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk.c:71
 msgid "L-Stick Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk.c:72
 msgid "L-Stick Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk.c:73
 msgid "R-Stick Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk.c:74
 msgid "R-Stick Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:75
+#: ../plugins/dfinput/cfg-gtk.c:75
 msgid "R-Stick Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:76
+#: ../plugins/dfinput/cfg-gtk.c:76
 msgid "R-Stick Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Centered"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Rightup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Rightdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Leftup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
 msgid "Leftdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
 msgid "Joystick: Button %d"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
 msgid "Keyboard:"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
 msgid "(Not Set)"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:575
+#: ../plugins/dfinput/cfg-gtk.c:575
 #: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
 msgid "None"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:623
+#: ../plugins/dfinput/cfg-gtk.c:623
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:629 ../plugins/dfinput/cfg-gtk2.c:649
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
 msgid "Key"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:635 ../plugins/dfinput/cfg-gtk2.c:655
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
 msgid "Button"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 82e80d0a..052d05ce 100755
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -572,7 +572,7 @@ msgstr "Abrir arquivo de trapaça"
 msgid "PCSXR Cheat Code Files (*.cht)"
 msgstr "Arquivos de trapaça do PCSXR (*.cht)"
 
-#: ../gui/Cheat.c:309 ../gui/Gtk2Gui.c:475 ../gui/Gtk2Gui.c:616
+#: ../gui/Cheat.c:309 ../gui/GtkGui.c:475 ../gui/GtkGui.c:616
 #: ../win32/gui/WndMain.c:1464 ../win32/gui/WndMain.c:1545
 msgid "All Files"
 msgstr "Todos os arquivos"
@@ -718,91 +718,91 @@ msgstr "Endereço:"
 msgid "Text"
 msgstr "Texturas"
 
-#: ../gui/Gtk2Gui.c:139
+#: ../gui/GtkGui.c:139
 msgid "Ready"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:180
+#: ../gui/GtkGui.c:180
 msgid "Emulation Paused."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:458
+#: ../gui/GtkGui.c:458
 msgid "Select PSX EXE File"
 msgstr "Selecione o arquivo executável de PSX"
 
-#: ../gui/Gtk2Gui.c:471
+#: ../gui/GtkGui.c:471
 msgid "PlayStation Executable Files"
 msgstr "Arquivos executáveis do PlayStation"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "Not a valid PSX file"
 msgstr "Não é um arquivo válido de PSX"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "Esse arquivo não parece ser um executável válido de PlayStation!"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692
 msgid "CD ROM failed"
 msgstr "CDROM falhou"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692 ../win32/gui/WndMain.c:469
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692 ../win32/gui/WndMain.c:469
 #: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Esse CD não parece ser um CD de PlayStation!"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703 ../win32/gui/WndMain.c:479
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703 ../win32/gui/WndMain.c:479
 #: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "Não pôde carregar o CDROM!"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703
 msgid "The CD-ROM could not be loaded"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Could not run BIOS"
 msgstr "Não conseguiu iniciar a BIOS"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "Iniciar pela BIOS não é suportado com a BIOS HLE interno."
 
-#: ../gui/Gtk2Gui.c:591
+#: ../gui/GtkGui.c:591
 msgid "Open PSX Disc Image File"
 msgstr "Abrir arquivo de imagem de CD de PSX"
 
-#: ../gui/Gtk2Gui.c:611
+#: ../gui/GtkGui.c:611
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "Arquivo de imagens de CD de PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:864
+#: ../gui/GtkGui.c:864
 #, c-format
 msgid "Loaded state %s."
 msgstr "Arquivo de estado \"%s\" carregado."
 
-#: ../gui/Gtk2Gui.c:867
+#: ../gui/GtkGui.c:867
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Erro ao carregar o arquivo de estado \"%s\"!"
 
-#: ../gui/Gtk2Gui.c:878
+#: ../gui/GtkGui.c:878
 #, c-format
 msgid "Saved state %s."
 msgstr "Arquivo de estado \"%s\" salvo."
 
-#: ../gui/Gtk2Gui.c:880
+#: ../gui/GtkGui.c:880
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../gui/Gtk2Gui.c:915 ../gui/Gtk2Gui.c:943
+#: ../gui/GtkGui.c:915 ../gui/GtkGui.c:943
 msgid "Select State File"
 msgstr "Selecione o arquivo de estado"
 
-#: ../gui/Gtk2Gui.c:986
+#: ../gui/GtkGui.c:986
 msgid "Notice"
 msgstr "Aviso"
 
@@ -1314,180 +1314,180 @@ msgstr ""
 msgid "32min"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk.c:49
 msgid "D-Pad Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk.c:50
 msgid "D-Pad Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk.c:51
 msgid "D-Pad Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk.c:52
 msgid "D-Pad Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk.c:53
 msgid "Cross"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk.c:54
 msgid "Circle"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk.c:55
 msgid "Square"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk.c:56
 msgid "Triangle"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk.c:57
 msgid "L1"
 msgstr "L1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk.c:58
 msgid "R1"
 msgstr "R1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk.c:59
 msgid "L2"
 msgstr "L2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk.c:60
 msgid "R2"
 msgstr "R2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk.c:61
 msgid "Select"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk.c:62
 msgid "Start"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk.c:63
 msgid "L3"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:64
+#: ../plugins/dfinput/cfg-gtk.c:64
 msgid "R3"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:65
+#: ../plugins/dfinput/cfg-gtk.c:65
 msgid "Analog"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk.c:69
 msgid "L-Stick Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk.c:70
 msgid "L-Stick Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk.c:71
 msgid "L-Stick Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk.c:72
 msgid "L-Stick Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk.c:73
 msgid "R-Stick Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk.c:74
 msgid "R-Stick Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:75
+#: ../plugins/dfinput/cfg-gtk.c:75
 msgid "R-Stick Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:76
+#: ../plugins/dfinput/cfg-gtk.c:76
 msgid "R-Stick Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Centered"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Rightup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Rightdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Leftup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
 msgid "Leftdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
 msgid "Joystick: Button %d"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
 msgid "Keyboard:"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
 msgid "(Not Set)"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:575
+#: ../plugins/dfinput/cfg-gtk.c:575
 #: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
 msgid "None"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:623
+#: ../plugins/dfinput/cfg-gtk.c:623
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:629 ../plugins/dfinput/cfg-gtk2.c:649
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
 msgid "Key"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:635 ../plugins/dfinput/cfg-gtk2.c:655
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
 msgid "Button"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 279c3816..e0df10c7 100755
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -554,7 +554,7 @@ msgstr "Открыть файл чита"
 msgid "PCSXR Cheat Code Files (*.cht)"
 msgstr "Файлы читов PCSXR (*.cht)"
 
-#: ../gui/Cheat.c:309 ../gui/Gtk2Gui.c:475 ../gui/Gtk2Gui.c:616
+#: ../gui/Cheat.c:309 ../gui/GtkGui.c:475 ../gui/GtkGui.c:616
 #: ../win32/gui/WndMain.c:1464 ../win32/gui/WndMain.c:1545
 msgid "All Files"
 msgstr "Все файлы"
@@ -694,93 +694,93 @@ msgstr "Адрес"
 msgid "Text"
 msgstr "Текст"
 
-#: ../gui/Gtk2Gui.c:139
+#: ../gui/GtkGui.c:139
 msgid "Ready"
 msgstr "Готово"
 
-#: ../gui/Gtk2Gui.c:180
+#: ../gui/GtkGui.c:180
 msgid "Emulation Paused."
 msgstr "Эмуляция приостановлена."
 
-#: ../gui/Gtk2Gui.c:458
+#: ../gui/GtkGui.c:458
 msgid "Select PSX EXE File"
 msgstr "Выберите PSX EXE файл"
 
-#: ../gui/Gtk2Gui.c:471
+#: ../gui/GtkGui.c:471
 msgid "PlayStation Executable Files"
 msgstr "Выполняемые файлы PlayStation"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "Not a valid PSX file"
 msgstr "Недопустимый формат файла"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "Файл не является запускным файлом PlayStation"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692
 msgid "CD ROM failed"
 msgstr "Ошибка CD-привода"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692 ../win32/gui/WndMain.c:469
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692 ../win32/gui/WndMain.c:469
 #: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Установленный CD-диск не является диском PlayStation"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703 ../win32/gui/WndMain.c:479
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703 ../win32/gui/WndMain.c:479
 #: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "Не удалось загрузить CD-ROM!"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703
 msgid "The CD-ROM could not be loaded"
 msgstr "Не удалось загрузить CD-ROM"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Could not run BIOS"
 msgstr "Не удалось запустить биос"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr ""
 "Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
 "музыку, при использовании HLE-биоса недоступна."
 
-#: ../gui/Gtk2Gui.c:591
+#: ../gui/GtkGui.c:591
 msgid "Open PSX Disc Image File"
 msgstr "Открыть образ PSX диска"
 
-#: ../gui/Gtk2Gui.c:611
+#: ../gui/GtkGui.c:611
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "Образы PSX дисков (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:864
+#: ../gui/GtkGui.c:864
 #, c-format
 msgid "Loaded state %s."
 msgstr "Состояние загружено %s."
 
-#: ../gui/Gtk2Gui.c:867
+#: ../gui/GtkGui.c:867
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Ошибка загрузки состояния %s!"
 
-#: ../gui/Gtk2Gui.c:878
+#: ../gui/GtkGui.c:878
 #, c-format
 msgid "Saved state %s."
 msgstr "Состояние сохранено %s."
 
-#: ../gui/Gtk2Gui.c:880
+#: ../gui/GtkGui.c:880
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Ошибка сохранения состояния %s!"
 
-#: ../gui/Gtk2Gui.c:915 ../gui/Gtk2Gui.c:943
+#: ../gui/GtkGui.c:915 ../gui/GtkGui.c:943
 msgid "Select State File"
 msgstr "Выберите файл состояния"
 
-#: ../gui/Gtk2Gui.c:986
+#: ../gui/GtkGui.c:986
 msgid "Notice"
 msgstr "Сообщение"
 
@@ -1293,180 +1293,180 @@ msgstr "16мин"
 msgid "32min"
 msgstr "32мин"
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk.c:49
 msgid "D-Pad Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk.c:50
 msgid "D-Pad Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk.c:51
 msgid "D-Pad Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk.c:52
 msgid "D-Pad Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk.c:53
 msgid "Cross"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk.c:54
 msgid "Circle"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk.c:55
 msgid "Square"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk.c:56
 msgid "Triangle"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk.c:57
 msgid "L1"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk.c:58
 msgid "R1"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk.c:59
 msgid "L2"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk.c:60
 msgid "R2"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk.c:61
 msgid "Select"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk.c:62
 msgid "Start"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk.c:63
 msgid "L3"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:64
+#: ../plugins/dfinput/cfg-gtk.c:64
 msgid "R3"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:65
+#: ../plugins/dfinput/cfg-gtk.c:65
 msgid "Analog"
 msgstr "Аналоговый контроллер "
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk.c:69
 msgid "L-Stick Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk.c:70
 msgid "L-Stick Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk.c:71
 msgid "L-Stick Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk.c:72
 msgid "L-Stick Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk.c:73
 msgid "R-Stick Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk.c:74
 msgid "R-Stick Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:75
+#: ../plugins/dfinput/cfg-gtk.c:75
 msgid "R-Stick Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:76
+#: ../plugins/dfinput/cfg-gtk.c:76
 msgid "R-Stick Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Centered"
 msgstr "Отцентровано"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Rightup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Rightdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Leftup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
 msgid "Leftdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "Джойстик: Кнопка %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "Джойстик: Ось %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "Джойстик: Крестовина %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
 msgid "Keyboard:"
 msgstr "Клавиатура:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
 msgid "(Not Set)"
 msgstr "(Не установлено)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:575
+#: ../plugins/dfinput/cfg-gtk.c:575
 #: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
 msgid "None"
 msgstr "Нету"
 
-#: ../plugins/dfinput/cfg-gtk2.c:623
+#: ../plugins/dfinput/cfg-gtk.c:623
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "Настройка Gamepad/Keyboard"
 
-#: ../plugins/dfinput/cfg-gtk2.c:629 ../plugins/dfinput/cfg-gtk2.c:649
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
 msgid "Key"
 msgstr "Клавиша"
 
-#: ../plugins/dfinput/cfg-gtk2.c:635 ../plugins/dfinput/cfg-gtk2.c:655
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
 msgid "Button"
 msgstr "Кнопка"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eeb9ea3c..be35a6c6 100755
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -600,8 +600,8 @@ msgid "PCSXR Cheat Code Files (*.cht)"
 msgstr "PCSXR 作弊码文件 (*.cht)"
 
 #: ../gui/Cheat.c:309
-#: ../gui/Gtk2Gui.c:475
-#: ../gui/Gtk2Gui.c:616
+#: ../gui/GtkGui.c:475
+#: ../gui/GtkGui.c:616
 #: ../win32/gui/WndMain.c:1464
 #: ../win32/gui/WndMain.c:1545
 msgid "All Files"
@@ -759,37 +759,37 @@ msgstr "地址"
 msgid "Text"
 msgstr "文本"
 
-#: ../gui/Gtk2Gui.c:139
+#: ../gui/GtkGui.c:139
 msgid "Ready"
 msgstr "就绪"
 
-#: ../gui/Gtk2Gui.c:180
+#: ../gui/GtkGui.c:180
 msgid "Emulation Paused."
 msgstr "模拟器已暂停。"
 
-#: ../gui/Gtk2Gui.c:458
+#: ../gui/GtkGui.c:458
 msgid "Select PSX EXE File"
 msgstr "选择 PS EXE 文件"
 
-#: ../gui/Gtk2Gui.c:471
+#: ../gui/GtkGui.c:471
 msgid "PlayStation Executable Files"
 msgstr "PlayStation 可执行文件"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "Not a valid PSX file"
 msgstr "不是一个合法的 PSX 文件"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一个合法的 PlayStation 可执行文件"
 
-#: ../gui/Gtk2Gui.c:537
-#: ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537
+#: ../gui/GtkGui.c:692
 msgid "CD ROM failed"
 msgstr "CD-ROM 失败"
 
-#: ../gui/Gtk2Gui.c:537
-#: ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537
+#: ../gui/GtkGui.c:692
 #: ../win32/gui/WndMain.c:469
 #: ../win32/gui/WndMain.c:521
 #: ../win32/gui/WndMain.c:590
@@ -797,8 +797,8 @@ msgstr "CD-ROM 失败"
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光盘不是一张合法的 PlayStation 光盘。"
 
-#: ../gui/Gtk2Gui.c:548
-#: ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548
+#: ../gui/GtkGui.c:703
 #: ../win32/gui/WndMain.c:479
 #: ../win32/gui/WndMain.c:531
 #: ../win32/gui/WndMain.c:600
@@ -806,53 +806,53 @@ msgstr "此光盘不是一张合法的 PlayStation 光盘。"
 msgid "Could not load CD-ROM!"
 msgstr "无法加载光盘!"
 
-#: ../gui/Gtk2Gui.c:548
-#: ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548
+#: ../gui/GtkGui.c:703
 msgid "The CD-ROM could not be loaded"
 msgstr "无法加载 CD-ROM"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Could not run BIOS"
 msgstr "无法运行 BIOS"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "内部 HLE BIOS 不支持直接运行。"
 
-#: ../gui/Gtk2Gui.c:591
+#: ../gui/GtkGui.c:591
 msgid "Open PSX Disc Image File"
 msgstr "打开 PS 光盘镜像文件"
 
-#: ../gui/Gtk2Gui.c:611
+#: ../gui/GtkGui.c:611
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PS 镜像文件 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:864
+#: ../gui/GtkGui.c:864
 #, c-format
 msgid "Loaded state %s."
 msgstr "已读取存档 %s。"
 
-#: ../gui/Gtk2Gui.c:867
+#: ../gui/GtkGui.c:867
 #, c-format
 msgid "Error loading state %s!"
 msgstr "读取存档 %s 时出错。"
 
-#: ../gui/Gtk2Gui.c:878
+#: ../gui/GtkGui.c:878
 #, c-format
 msgid "Saved state %s."
 msgstr "已保存存档 %s"
 
-#: ../gui/Gtk2Gui.c:880
+#: ../gui/GtkGui.c:880
 #, c-format
 msgid "Error saving state %s!"
 msgstr "保存存档 %s 时出错。"
 
-#: ../gui/Gtk2Gui.c:915
-#: ../gui/Gtk2Gui.c:943
+#: ../gui/GtkGui.c:915
+#: ../gui/GtkGui.c:943
 msgid "Select State File"
 msgstr "选择存档文件"
 
-#: ../gui/Gtk2Gui.c:986
+#: ../gui/GtkGui.c:986
 msgid "Notice"
 msgstr "警告"
 
@@ -1365,196 +1365,196 @@ msgstr "16分钟"
 msgid "32min"
 msgstr "32分钟"
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk.c:49
 msgid "D-Pad Up"
 msgstr "方向键上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk.c:50
 msgid "D-Pad Down"
 msgstr "方向键下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk.c:51
 msgid "D-Pad Left"
 msgstr "方向键左"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk.c:52
 msgid "D-Pad Right"
 msgstr "方向键右"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk.c:53
 msgid "Cross"
 msgstr "叉号键"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk.c:54
 msgid "Circle"
 msgstr "圆圈键"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk.c:55
 msgid "Square"
 msgstr "方块键"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk.c:56
 msgid "Triangle"
 msgstr "三角键"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk.c:57
 msgid "L1"
 msgstr "L1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk.c:58
 msgid "R1"
 msgstr "R1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk.c:59
 msgid "L2"
 msgstr "L2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk.c:60
 msgid "R2"
 msgstr "R2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk.c:61
 msgid "Select"
 msgstr "选择键"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk.c:62
 msgid "Start"
 msgstr "开始键"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk.c:63
 msgid "L3"
 msgstr "L3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:64
+#: ../plugins/dfinput/cfg-gtk.c:64
 msgid "R3"
 msgstr "R3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:65
+#: ../plugins/dfinput/cfg-gtk.c:65
 msgid "Analog"
 msgstr "摇杆手柄"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk.c:69
 msgid "L-Stick Right"
 msgstr "左摇杆右方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk.c:70
 msgid "L-Stick Left"
 msgstr "左摇杆左方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk.c:71
 msgid "L-Stick Down"
 msgstr "左摇杆下方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk.c:72
 msgid "L-Stick Up"
 msgstr "左摇杆上方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk.c:73
 msgid "R-Stick Right"
 msgstr "右摇杆右方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk.c:74
 msgid "R-Stick Left"
 msgstr "右摇杆左方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:75
+#: ../plugins/dfinput/cfg-gtk.c:75
 msgid "R-Stick Down"
 msgstr "右摇杆下方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:76
+#: ../plugins/dfinput/cfg-gtk.c:76
 msgid "R-Stick Up"
 msgstr "右摇杆上方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102
-#: ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102
+#: ../plugins/dfinput/cfg-gtk.c:141
 msgid "Centered"
 msgstr "居中"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102
-#: ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102
+#: ../plugins/dfinput/cfg-gtk.c:141
 msgid "Up"
 msgstr "上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102
-#: ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102
+#: ../plugins/dfinput/cfg-gtk.c:141
 msgid "Right"
 msgstr "右方向键"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102
-#: ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102
+#: ../plugins/dfinput/cfg-gtk.c:141
 msgid "Rightup"
 msgstr "右上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103
+#: ../plugins/dfinput/cfg-gtk.c:142
 msgid "Down"
 msgstr "下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103
+#: ../plugins/dfinput/cfg-gtk.c:142
 msgid "Rightdown"
 msgstr "右下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103
+#: ../plugins/dfinput/cfg-gtk.c:142
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103
+#: ../plugins/dfinput/cfg-gtk.c:142
 msgid "Leftup"
 msgstr "左上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk.c:104
+#: ../plugins/dfinput/cfg-gtk.c:143
 msgid "Leftdown"
 msgstr "左下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:108
-#: ../plugins/dfinput/cfg-gtk2.c:147
+#: ../plugins/dfinput/cfg-gtk.c:108
+#: ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "手柄: 按钮 %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:112
-#: ../plugins/dfinput/cfg-gtk2.c:151
+#: ../plugins/dfinput/cfg-gtk.c:112
+#: ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "手柄: 轴 %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:117
-#: ../plugins/dfinput/cfg-gtk2.c:156
+#: ../plugins/dfinput/cfg-gtk.c:117
+#: ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "Joystick: 操纵杆 %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:132
-#: ../plugins/dfinput/cfg-gtk2.c:171
+#: ../plugins/dfinput/cfg-gtk.c:132
+#: ../plugins/dfinput/cfg-gtk.c:171
 msgid "Keyboard:"
 msgstr "键盘:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:136
-#: ../plugins/dfinput/cfg-gtk2.c:175
+#: ../plugins/dfinput/cfg-gtk.c:136
+#: ../plugins/dfinput/cfg-gtk.c:175
 msgid "(Not Set)"
 msgstr "(未设定)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:575
+#: ../plugins/dfinput/cfg-gtk.c:575
 #: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
 msgid "None"
 msgstr "无"
 
-#: ../plugins/dfinput/cfg-gtk2.c:623
+#: ../plugins/dfinput/cfg-gtk.c:623
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "手柄/键盘输入配置"
 
-#: ../plugins/dfinput/cfg-gtk2.c:629
-#: ../plugins/dfinput/cfg-gtk2.c:649
+#: ../plugins/dfinput/cfg-gtk.c:629
+#: ../plugins/dfinput/cfg-gtk.c:649
 msgid "Key"
 msgstr "按钮"
 
-#: ../plugins/dfinput/cfg-gtk2.c:635
-#: ../plugins/dfinput/cfg-gtk2.c:655
+#: ../plugins/dfinput/cfg-gtk.c:635
+#: ../plugins/dfinput/cfg-gtk.c:655
 msgid "Button"
 msgstr "按键"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7ed34a78..63927dae 100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -572,7 +572,7 @@ msgstr "打開金手指檔"
 msgid "PCSXR Cheat Code Files (*.cht)"
 msgstr "PCSXR 金手指檔 (*.cht)"
 
-#: ../gui/Cheat.c:309 ../gui/Gtk2Gui.c:475 ../gui/Gtk2Gui.c:616
+#: ../gui/Cheat.c:309 ../gui/GtkGui.c:475 ../gui/GtkGui.c:616
 #: ../win32/gui/WndMain.c:1464 ../win32/gui/WndMain.c:1545
 msgid "All Files"
 msgstr "所有檔案"
@@ -712,91 +712,91 @@ msgstr "位址"
 msgid "Text"
 msgstr "文字"
 
-#: ../gui/Gtk2Gui.c:139
+#: ../gui/GtkGui.c:139
 msgid "Ready"
 msgstr "就緒"
 
-#: ../gui/Gtk2Gui.c:180
+#: ../gui/GtkGui.c:180
 msgid "Emulation Paused."
 msgstr "模擬器已暫停。"
 
-#: ../gui/Gtk2Gui.c:458
+#: ../gui/GtkGui.c:458
 msgid "Select PSX EXE File"
 msgstr "選擇 PS EXE 檔案"
 
-#: ../gui/Gtk2Gui.c:471
+#: ../gui/GtkGui.c:471
 msgid "PlayStation Executable Files"
 msgstr "PlayStation 執行檔"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "Not a valid PSX file"
 msgstr "不是一個合法的 PSX 檔"
 
-#: ../gui/Gtk2Gui.c:508
+#: ../gui/GtkGui.c:508
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一個合法的 PlayStation 執行檔"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692
 msgid "CD ROM failed"
 msgstr "CD-ROM 失敗"
 
-#: ../gui/Gtk2Gui.c:537 ../gui/Gtk2Gui.c:692 ../win32/gui/WndMain.c:469
+#: ../gui/GtkGui.c:537 ../gui/GtkGui.c:692 ../win32/gui/WndMain.c:469
 #: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光碟不是一張合法的 PlayStation 光碟。"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703 ../win32/gui/WndMain.c:479
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703 ../win32/gui/WndMain.c:479
 #: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "無法加載光碟!"
 
-#: ../gui/Gtk2Gui.c:548 ../gui/Gtk2Gui.c:703
+#: ../gui/GtkGui.c:548 ../gui/GtkGui.c:703
 msgid "The CD-ROM could not be loaded"
 msgstr "無法加載 CD-ROM"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Could not run BIOS"
 msgstr "無法執行 BIOS"
 
-#: ../gui/Gtk2Gui.c:562
+#: ../gui/GtkGui.c:562
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: ../gui/Gtk2Gui.c:591
+#: ../gui/GtkGui.c:591
 msgid "Open PSX Disc Image File"
 msgstr "打開 PS 光碟映像檔"
 
-#: ../gui/Gtk2Gui.c:611
+#: ../gui/GtkGui.c:611
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PS 鏡像檔 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:864
+#: ../gui/GtkGui.c:864
 #, c-format
 msgid "Loaded state %s."
 msgstr "已讀取記錄 %s。"
 
-#: ../gui/Gtk2Gui.c:867
+#: ../gui/GtkGui.c:867
 #, c-format
 msgid "Error loading state %s!"
 msgstr "讀取記錄 %s 時出錯。"
 
-#: ../gui/Gtk2Gui.c:878
+#: ../gui/GtkGui.c:878
 #, c-format
 msgid "Saved state %s."
 msgstr "已存儲記錄 %s"
 
-#: ../gui/Gtk2Gui.c:880
+#: ../gui/GtkGui.c:880
 #, c-format
 msgid "Error saving state %s!"
 msgstr "存儲記錄 %s 時出錯。"
 
-#: ../gui/Gtk2Gui.c:915 ../gui/Gtk2Gui.c:943
+#: ../gui/GtkGui.c:915 ../gui/GtkGui.c:943
 msgid "Select State File"
 msgstr "選擇記錄檔案"
 
-#: ../gui/Gtk2Gui.c:986
+#: ../gui/GtkGui.c:986
 msgid "Notice"
 msgstr "警告"
 
@@ -1297,181 +1297,181 @@ msgstr ""
 msgid "32min"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk.c:49
 msgid "D-Pad Up"
 msgstr "上方向鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk.c:50
 msgid "D-Pad Down"
 msgstr "下方向鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk.c:51
 msgid "D-Pad Left"
 msgstr "左方向鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk.c:52
 msgid "D-Pad Right"
 msgstr "右方向鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk.c:53
 msgid "Cross"
 msgstr "叉號鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk.c:54
 msgid "Circle"
 msgstr "圓圈鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk.c:55
 msgid "Square"
 msgstr "方塊鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk.c:56
 msgid "Triangle"
 msgstr "三角鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk.c:57
 msgid "L1"
 msgstr "L1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk.c:58
 msgid "R1"
 msgstr "R1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk.c:59
 msgid "L2"
 msgstr "L2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk.c:60
 msgid "R2"
 msgstr "R2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk.c:61
 msgid "Select"
 msgstr "選擇鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk.c:62
 msgid "Start"
 msgstr "開始鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk.c:63
 msgid "L3"
 msgstr "L3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:64
+#: ../plugins/dfinput/cfg-gtk.c:64
 msgid "R3"
 msgstr "R3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:65
+#: ../plugins/dfinput/cfg-gtk.c:65
 #, fuzzy
 msgid "Analog"
 msgstr "類比手把"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk.c:69
 msgid "L-Stick Right"
 msgstr "左搖桿右方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk.c:70
 msgid "L-Stick Left"
 msgstr "左搖桿左方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk.c:71
 msgid "L-Stick Down"
 msgstr "左搖桿下方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk.c:72
 msgid "L-Stick Up"
 msgstr "左搖桿上方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk.c:73
 msgid "R-Stick Right"
 msgstr "右搖桿右方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk.c:74
 msgid "R-Stick Left"
 msgstr "右搖桿左方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:75
+#: ../plugins/dfinput/cfg-gtk.c:75
 msgid "R-Stick Down"
 msgstr "右搖桿下方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:76
+#: ../plugins/dfinput/cfg-gtk.c:76
 msgid "R-Stick Up"
 msgstr "右搖桿上方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Centered"
 msgstr "居中"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Up"
 msgstr "上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Right"
 msgstr "右"
 
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
 msgid "Rightup"
 msgstr "右上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Down"
 msgstr "下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Rightdown"
 msgstr "右下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
 msgid "Leftup"
 msgstr "左上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
 msgid "Leftdown"
 msgstr "左下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "手把: 按鈕 %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "手把: 軸 %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "手把: Hat %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
 msgid "Keyboard:"
 msgstr "鍵盤:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
 msgid "(Not Set)"
 msgstr "(未設定)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:575
+#: ../plugins/dfinput/cfg-gtk.c:575
 #: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
 msgid "None"
 msgstr "無"
 
-#: ../plugins/dfinput/cfg-gtk2.c:623
+#: ../plugins/dfinput/cfg-gtk.c:623
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "手把/鍵盤輸入設定"
 
-#: ../plugins/dfinput/cfg-gtk2.c:629 ../plugins/dfinput/cfg-gtk2.c:649
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
 msgid "Key"
 msgstr "按鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:635 ../plugins/dfinput/cfg-gtk2.c:655
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
 msgid "Button"
 msgstr "按鈕"