diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32c3c1bf..78cb15e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,7 @@ endif( ENABLE_LINK )
 # so that pkg-config is not required
 IF( ENABLE_GTK )
     FIND_PACKAGE ( PkgConfig REQUIRED )
+    FIND_PACKAGE ( Gettext REQUIRED )
 
     # These dependencies require pkg-config to be found
     PKG_CHECK_MODULES ( GTKMM REQUIRED gtkmm-2.4 )
@@ -101,7 +102,9 @@ ENDIF( NOT ENABLE_ASM_CORE )
 
 # Enable internationalization
 if( ENABLE_NLS )
-    ADD_DEFINITIONS (-DENABLE_NLS)
+    SET( LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale )
+    ADD_DEFINITIONS ( -DENABLE_NLS )
+    ADD_DEFINITIONS ( -DLOCALEDIR=\\\"${LOCALEDIR}\\\" )
 endif( ENABLE_NLS )
 
 # Compiler flags
@@ -113,6 +116,11 @@ ENDIF ( WIN32 )
 SET( CMAKE_C_FLAGS "-O3 -Wall")
 SET( CMAKE_CXX_FLAGS "-O3 -Wall")
 
+# Native Language Support
+if( ENABLE_NLS )
+    add_subdirectory(po)
+endif( ENABLE_NLS )
+
 # Source files definition
 SET(SRC_FEX
     fex/7z_C/7zAlloc.c
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 00000000..1f3960b8
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1 @@
+GETTEXT_CREATE_TRANSLATIONS(gvbam.pot gvbam/en.po gvbam/fr.po)
diff --git a/po/gvbam.pot b/po/gvbam.pot
index 51c68bbc..65f57c10 100644
--- a/po/gvbam.pot
+++ b/po/gvbam.pot
@@ -1,11 +1,11 @@
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the VBA-M package.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 14:05+0100\n"
+"POT-Creation-Date: 2011-02-24 17:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,11 +25,11 @@ msgstr ""
 msgid "CodeBreaker Advance"
 msgstr ""
 
-#: ../src/gtk/cheatlist.cpp:73 ../src/gtk/ui/cheatlist.ui:21
+#: ../src/gtk/cheatlist.cpp:73 tmp/cheatlist.ui.h:5
 msgid "Open cheat list"
 msgstr ""
 
-#: ../src/gtk/cheatlist.cpp:96 ../src/gtk/ui/cheatlist.ui:34
+#: ../src/gtk/cheatlist.cpp:96 tmp/cheatlist.ui.h:6
 msgid "Save cheat list"
 msgstr ""
 
@@ -58,6 +58,7 @@ msgid "Directories config"
 msgstr ""
 
 #: ../src/gtk/filters.cpp:60 ../src/gtk/filters.cpp:80
+#: tmp/gameboyadvance.ui.h:12 tmp/preferences.ui.h:7
 msgid "None"
 msgstr ""
 
@@ -225,19 +226,19 @@ msgstr ""
 msgid "<Undefined>"
 msgstr ""
 
-#: ../src/gtk/main.cpp:40 ../src/gtk/windowcallbacks.cpp:496
+#: ../src/gtk/main.cpp:42 ../src/gtk/windowcallbacks.cpp:496
 msgid "VBA-M"
 msgstr ""
 
-#: ../src/gtk/main.cpp:49
+#: ../src/gtk/main.cpp:51
 msgid "Main VBA-M options"
 msgstr ""
 
-#: ../src/gtk/main.cpp:54
+#: ../src/gtk/main.cpp:56
 msgid "Output version information."
 msgstr ""
 
-#: ../src/gtk/main.cpp:80
+#: ../src/gtk/main.cpp:82
 #, c-format
 msgid "VisualBoyAdvance version %s [GTK+]\n"
 msgstr ""
@@ -336,344 +337,390 @@ msgstr ""
 msgid "Nintendo GameBoy Advance emulator."
 msgstr ""
 
-#: ../src/gtk/ui/cheatedit.ui:13
-msgid "Edit cheat"
-msgstr ""
-
-#: ../src/gtk/ui/cheatedit.ui:44
-msgid "<b>Description</b>"
-msgstr ""
-
-#: ../src/gtk/ui/cheatedit.ui:80
-msgid "<b>Type</b>"
-msgstr ""
-
-#: ../src/gtk/ui/cheatedit.ui:118
+#: tmp/cheatedit.ui.h:1
 msgid "<b>Codes</b>"
 msgstr ""
 
-#: ../src/gtk/ui/cheatlist.ui:9
-msgid "Cheat list"
+#: tmp/cheatedit.ui.h:2
+msgid "<b>Description</b>"
 msgstr ""
 
-#: ../src/gtk/ui/cheatlist.ui:22
-msgid "gtk-open"
+#: tmp/cheatedit.ui.h:3
+msgid "<b>Type</b>"
 msgstr ""
 
-#: ../src/gtk/ui/cheatlist.ui:35
-msgid "gtk-save"
+#: tmp/cheatedit.ui.h:4
+msgid "Edit cheat"
 msgstr ""
 
-#: ../src/gtk/ui/cheatlist.ui:56
+#: tmp/cheatlist.ui.h:1
 msgid "Add new cheat"
 msgstr ""
 
-#: ../src/gtk/ui/cheatlist.ui:57
-msgid "gtk-add"
+#: tmp/cheatlist.ui.h:2
+msgid "Cheat list"
 msgstr ""
 
-#: ../src/gtk/ui/cheatlist.ui:69
-msgid "Delete selected cheat"
-msgstr ""
-
-#: ../src/gtk/ui/cheatlist.ui:70
-msgid "gtk-delete"
-msgstr ""
-
-#: ../src/gtk/ui/cheatlist.ui:82
+#: tmp/cheatlist.ui.h:3
 msgid "Delete all cheats"
 msgstr ""
 
-#: ../src/gtk/ui/cheatlist.ui:103
+#: tmp/cheatlist.ui.h:4
+msgid "Delete selected cheat"
+msgstr ""
+
+#: tmp/cheatlist.ui.h:7
 msgid "Toggle all Cheats"
 msgstr ""
 
-#: ../src/gtk/ui/cheatlist.ui:104
-msgid "gtk-markall"
-msgstr ""
-
-#: ../src/gtk/ui/display.ui:71
-msgid "OpenGL"
-msgstr ""
-
-#: ../src/gtk/ui/display.ui:80
-msgid "Cairo"
-msgstr ""
-
-#: ../src/gtk/ui/display.ui:96
-msgid "<b>Output module</b>"
-msgstr ""
-
-#: ../src/gtk/ui/display.ui:122
-msgid "Default scale : "
-msgstr ""
-
-#: ../src/gtk/ui/display.ui:151
-msgid "<b>Zoom</b>"
-msgstr ""
-
-#: ../src/gtk/ui/display.ui:179
-msgid "Interframe blending : "
-msgstr ""
-
-#: ../src/gtk/ui/display.ui:191
-msgid "Fullscreen filter : "
-msgstr ""
-
-#: ../src/gtk/ui/display.ui:238
+#: tmp/display.ui.h:1
 msgid "<b>Filters</b>"
 msgstr ""
 
-#: ../src/gtk/ui/display.ui:259 ../src/gtk/ui/gameboy.ui:187
-#: ../src/gtk/ui/gameboyadvance.ui:246 ../src/gtk/ui/preferences.ui:179
-#: ../src/gtk/ui/sound.ui:135
-msgid "gtk-close"
+#: tmp/display.ui.h:2
+msgid "<b>Output module</b>"
 msgstr ""
 
-#: ../src/gtk/ui/gameboy.ui:31
-msgid "GameBoy settings"
+#: tmp/display.ui.h:3
+msgid "<b>Zoom</b>"
 msgstr ""
 
-#: ../src/gtk/ui/gameboy.ui:56
-msgid "Emulated system : "
+#: tmp/display.ui.h:4
+msgid "Cairo"
 msgstr ""
 
-#: ../src/gtk/ui/gameboy.ui:80
-msgid "Display Super Game Boy borders"
+#: tmp/display.ui.h:5
+msgid "Default scale : "
 msgstr ""
 
-#: ../src/gtk/ui/gameboy.ui:91
-msgid "Emulate a Game Boy Printer"
+#: tmp/display.ui.h:6
+msgid "Fullscreen filter : "
 msgstr ""
 
-#: ../src/gtk/ui/gameboy.ui:105
-msgid "<b>System and peripherals</b>"
+#: tmp/display.ui.h:7
+msgid "Interframe blending : "
 msgstr ""
 
-#: ../src/gtk/ui/gameboy.ui:130
-msgid "Use a Game Boy boot ROM file"
+#: tmp/display.ui.h:8
+msgid "OpenGL"
 msgstr ""
 
-#: ../src/gtk/ui/gameboy.ui:140
-msgid "Boot ROM file : "
-msgstr ""
-
-#: ../src/gtk/ui/gameboy.ui:166
+#: tmp/gameboy.ui.h:1
 msgid "<b>Boot ROM</b>"
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:44
-msgid "Game Boy Advance settings"
+#: tmp/gameboy.ui.h:2
+msgid "<b>System and peripherals</b>"
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:102
-msgid "Flash size : "
+#: tmp/gameboy.ui.h:3 tmp/gameboyadvance.ui.h:4
+msgid "Automatic"
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:114
-msgid "Save type : "
+#: tmp/gameboy.ui.h:4
+msgid "Boot ROM file : "
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:128
-msgid "<b>Cartridge</b>"
+#: tmp/gameboy.ui.h:5
+msgid "Display Super Game Boy borders"
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:153
-msgid "Use a bios file"
+#: tmp/gameboy.ui.h:6
+msgid "Emulate a Game Boy Printer"
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:163
-msgid "Bios file : "
+#: tmp/gameboy.ui.h:7
+msgid "Emulated system : "
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:189
+#: tmp/gameboy.ui.h:8
+msgid "Game Boy"
+msgstr ""
+
+#: tmp/gameboy.ui.h:9
+msgid "Game Boy Advance"
+msgstr ""
+
+#: tmp/gameboy.ui.h:10
+msgid "Game Boy Color"
+msgstr ""
+
+#: tmp/gameboy.ui.h:11
+msgid "GameBoy settings"
+msgstr ""
+
+#: tmp/gameboy.ui.h:12
+msgid "Super Game Boy"
+msgstr ""
+
+#: tmp/gameboy.ui.h:13
+msgid "Super Game Boy 2"
+msgstr ""
+
+#: tmp/gameboy.ui.h:14
+msgid "Use a Game Boy boot ROM file"
+msgstr ""
+
+#: tmp/gameboyadvance.ui.h:1
 msgid "<b>Bios</b>"
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:214
-msgid "Enable real-time clock"
+#: tmp/gameboyadvance.ui.h:2
+msgid "<b>Cartridge</b>"
 msgstr ""
 
-#: ../src/gtk/ui/gameboyadvance.ui:225
+#: tmp/gameboyadvance.ui.h:3
 msgid "<b>Real-Time Clock</b>"
 msgstr ""
 
-#: ../src/gtk/ui/preferences.ui:7
-msgid "Preferences"
+#: tmp/gameboyadvance.ui.h:5
+msgid "Bios file : "
 msgstr ""
 
-#: ../src/gtk/ui/preferences.ui:25
-msgid "Pause when inactive"
+#: tmp/gameboyadvance.ui.h:6
+msgid "EEPROM"
 msgstr ""
 
-#: ../src/gtk/ui/preferences.ui:37
-msgid "<b>General</b>"
+#: tmp/gameboyadvance.ui.h:7
+msgid "EEPROM + Sensor"
 msgstr ""
 
-#: ../src/gtk/ui/preferences.ui:62
-msgid "Enable automatic frame skipping"
+#: tmp/gameboyadvance.ui.h:8
+msgid "Enable real-time clock"
 msgstr ""
 
-#: ../src/gtk/ui/preferences.ui:79
-msgid "Frameskip level : "
+#: tmp/gameboyadvance.ui.h:9
+msgid "Flash"
 msgstr ""
 
-#: ../src/gtk/ui/preferences.ui:109
-msgid "<b>Frameskip</b>"
+#: tmp/gameboyadvance.ui.h:10
+msgid "Flash size : "
 msgstr ""
 
-#: ../src/gtk/ui/preferences.ui:134
-msgid "Speed indicator : "
+#: tmp/gameboyadvance.ui.h:11
+msgid "Game Boy Advance settings"
 msgstr ""
 
-#: ../src/gtk/ui/preferences.ui:163
+#: tmp/gameboyadvance.ui.h:13
+msgid "SRAM"
+msgstr ""
+
+#: tmp/gameboyadvance.ui.h:14
+msgid "Save type : "
+msgstr ""
+
+#: tmp/gameboyadvance.ui.h:15
+msgid "Use a bios file"
+msgstr ""
+
+#: tmp/preferences.ui.h:1
 msgid "<b>Appearance</b>"
 msgstr ""
 
-#: ../src/gtk/ui/sound.ui:82
-msgid "Volume : "
+#: tmp/preferences.ui.h:2
+msgid "<b>Frameskip</b>"
 msgstr ""
 
-#: ../src/gtk/ui/sound.ui:92
+#: tmp/preferences.ui.h:3
+msgid "<b>General</b>"
+msgstr ""
+
+#: tmp/preferences.ui.h:4
+msgid "Detailed"
+msgstr ""
+
+#: tmp/preferences.ui.h:5
+msgid "Enable automatic frame skipping"
+msgstr ""
+
+#: tmp/preferences.ui.h:6
+msgid "Frameskip level : "
+msgstr ""
+
+#: tmp/preferences.ui.h:8
+msgid "Pause when inactive"
+msgstr ""
+
+#: tmp/preferences.ui.h:9
+msgid "Percentage"
+msgstr ""
+
+#: tmp/preferences.ui.h:10
+msgid "Preferences"
+msgstr ""
+
+#: tmp/preferences.ui.h:11
+msgid "Speed indicator : "
+msgstr ""
+
+#: tmp/sound.ui.h:2
+#, no-c-format
+msgid "100 %"
+msgstr ""
+
+#: tmp/sound.ui.h:4
+#, no-c-format
+msgid "200 %"
+msgstr ""
+
+#: tmp/sound.ui.h:6
+#, no-c-format
+msgid "25 %"
+msgstr ""
+
+#: tmp/sound.ui.h:8
+#, no-c-format
+msgid "50 %"
+msgstr ""
+
+#: tmp/sound.ui.h:9
+msgid "Mute"
+msgstr ""
+
+#: tmp/sound.ui.h:10
 msgid "Sample rate : "
 msgstr ""
 
-#: ../src/gtk/ui/vbam.ui:7
-msgid "VBA"
+#: tmp/sound.ui.h:11
+msgid "Volume : "
 msgstr ""
 
-#: ../src/gtk/ui/vbam.ui:24
-msgid "_File"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:45
-msgid "Open rece_nt"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:60
-msgid "Screen capt_ure..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:102
-msgid "_Emulation"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:112
-msgid "Pause"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:122
-msgid "_Reset"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:150
-msgid "Loa_d state"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:160
-msgid "Most recent"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:169
+#: tmp/vbam.ui.h:1
 msgid "Auto load most recent"
 msgstr ""
 
-#: ../src/gtk/ui/vbam.ui:184 ../src/gtk/ui/vbam.ui:323
-msgid "Slot1"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:194 ../src/gtk/ui/vbam.ui:333
-msgid "Slot2"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:204 ../src/gtk/ui/vbam.ui:343
-msgid "Slot3"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:214 ../src/gtk/ui/vbam.ui:353
-msgid "Slot4"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:224 ../src/gtk/ui/vbam.ui:363
-msgid "Slot5"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:234 ../src/gtk/ui/vbam.ui:373
-msgid "Slot6"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:244 ../src/gtk/ui/vbam.ui:383
-msgid "Slot7"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:254 ../src/gtk/ui/vbam.ui:393
-msgid "Slot8"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:264 ../src/gtk/ui/vbam.ui:403
-msgid "Slot9"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:274 ../src/gtk/ui/vbam.ui:413
-msgid "Slot10"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:284
-msgid "From _File ..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:298
-msgid "S_ave state"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:308
-msgid "Oldest slot"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:429
-msgid "To _File ..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:449
-msgid "_List cheats ..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:459
-msgid "_Disable cheats"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:472
-msgid "_Options"
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:482
-msgid "_Preferences ..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:491
-msgid "_Game Boy ..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:500
-msgid "Game Boy _Advance ..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:509
-msgid "_Display ..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:518
-msgid "_Sound ..."
-msgstr ""
-
-#: ../src/gtk/ui/vbam.ui:527
+#: tmp/vbam.ui.h:2
 msgid "D_irectories ..."
 msgstr ""
 
-#: ../src/gtk/ui/vbam.ui:536
+#: tmp/vbam.ui.h:3
+msgid "From _File ..."
+msgstr ""
+
+#: tmp/vbam.ui.h:4
+msgid "Game Boy _Advance ..."
+msgstr ""
+
+#: tmp/vbam.ui.h:5
+msgid "Loa_d state"
+msgstr ""
+
+#: tmp/vbam.ui.h:6
+msgid "Most recent"
+msgstr ""
+
+#: tmp/vbam.ui.h:7
+msgid "Oldest slot"
+msgstr ""
+
+#: tmp/vbam.ui.h:8
+msgid "Open rece_nt"
+msgstr ""
+
+#: tmp/vbam.ui.h:9
+msgid "Pause"
+msgstr ""
+
+#: tmp/vbam.ui.h:10
+msgid "S_ave state"
+msgstr ""
+
+#: tmp/vbam.ui.h:11
+msgid "Screen capt_ure..."
+msgstr ""
+
+#: tmp/vbam.ui.h:12
+msgid "Slot1"
+msgstr ""
+
+#: tmp/vbam.ui.h:13
+msgid "Slot10"
+msgstr ""
+
+#: tmp/vbam.ui.h:14
+msgid "Slot2"
+msgstr ""
+
+#: tmp/vbam.ui.h:15
+msgid "Slot3"
+msgstr ""
+
+#: tmp/vbam.ui.h:16
+msgid "Slot4"
+msgstr ""
+
+#: tmp/vbam.ui.h:17
+msgid "Slot5"
+msgstr ""
+
+#: tmp/vbam.ui.h:18
+msgid "Slot6"
+msgstr ""
+
+#: tmp/vbam.ui.h:19
+msgid "Slot7"
+msgstr ""
+
+#: tmp/vbam.ui.h:20
+msgid "Slot8"
+msgstr ""
+
+#: tmp/vbam.ui.h:21
+msgid "Slot9"
+msgstr ""
+
+#: tmp/vbam.ui.h:22
+msgid "To _File ..."
+msgstr ""
+
+#: tmp/vbam.ui.h:23
+msgid "VBA"
+msgstr ""
+
+#: tmp/vbam.ui.h:24
+msgid "_Disable cheats"
+msgstr ""
+
+#: tmp/vbam.ui.h:25
+msgid "_Display ..."
+msgstr ""
+
+#: tmp/vbam.ui.h:26
+msgid "_Emulation"
+msgstr ""
+
+#: tmp/vbam.ui.h:27
+msgid "_File"
+msgstr ""
+
+#: tmp/vbam.ui.h:28
+msgid "_Game Boy ..."
+msgstr ""
+
+#: tmp/vbam.ui.h:29
+msgid "_Help"
+msgstr ""
+
+#: tmp/vbam.ui.h:30
 msgid "_Joypads ..."
 msgstr ""
 
-#: ../src/gtk/ui/vbam.ui:549
-msgid "_Help"
+#: tmp/vbam.ui.h:31
+msgid "_List cheats ..."
+msgstr ""
+
+#: tmp/vbam.ui.h:32
+msgid "_Options"
+msgstr ""
+
+#: tmp/vbam.ui.h:33
+msgid "_Preferences ..."
+msgstr ""
+
+#: tmp/vbam.ui.h:34
+msgid "_Reset"
+msgstr ""
+
+#: tmp/vbam.ui.h:35
+msgid "_Sound ..."
 msgstr ""
diff --git a/po/gvbam/en.po b/po/gvbam/en.po
new file mode 100644
index 00000000..58ef8573
--- /dev/null
+++ b/po/gvbam/en.po
@@ -0,0 +1,680 @@
+# This file is distributed under the same license as the PACKAGE package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VBA-M\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-24 14:05+0100\n"
+"PO-Revision-Date: 2011-02-24 13:15+0000\n"
+"Last-Translator: bgK <bastien.bouclet@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../src/gtk/joypadconfig.cpp:142
+msgid " Axis "
+msgstr " Axis "
+
+#: ../src/gtk/joypadconfig.cpp:135
+msgid " Button "
+msgstr " Button "
+
+#: ../src/gtk/joypadconfig.cpp:150
+msgid " Hat "
+msgstr " Hat "
+
+#: ../src/gtk/window.cpp:1368
+msgid "%Y/%m/%d %H:%M:%S"
+msgstr "%Y/%m/%d %H:%M:%S"
+
+#: ../src/gtk/screenarea-opengl.cpp:41
+#, c-format
+msgid "*** OpenGL : Cannot open display.\n"
+msgstr "*** OpenGL : Cannot open display.\n"
+
+#: ../src/gtk/window.cpp:1338 ../src/gtk/window.cpp:1383
+msgid "----/--/-- --:--:--"
+msgstr "----/--/-- --:--:--"
+
+#: ../src/gtk/filters.cpp:61
+msgid "2xSaI"
+msgstr "2xSaI"
+
+#: ../src/gtk/joypadconfig.cpp:165
+msgid "<Undefined>"
+msgstr "<Undefined>"
+
+#: ../src/gtk/ui/preferences.ui:163
+msgid "<b>Appearance</b>"
+msgstr "<b>Appearance</b>"
+
+#: ../src/gtk/ui/gameboyadvance.ui:189
+msgid "<b>Bios</b>"
+msgstr "<b>Bios</b>"
+
+#: ../src/gtk/ui/gameboy.ui:166
+msgid "<b>Boot ROM</b>"
+msgstr "<b>Boot ROM</b>"
+
+#: ../src/gtk/ui/gameboyadvance.ui:128
+msgid "<b>Cartridge</b>"
+msgstr "<b>Cartridge</b>"
+
+#: ../src/gtk/ui/cheatedit.ui:118
+msgid "<b>Codes</b>"
+msgstr "<b>Codes</b>"
+
+#: ../src/gtk/ui/cheatedit.ui:44
+msgid "<b>Description</b>"
+msgstr "<b>Description</b>"
+
+#: ../src/gtk/ui/display.ui:238
+msgid "<b>Filters</b>"
+msgstr "<b>Filters</b>"
+
+#: ../src/gtk/ui/preferences.ui:109
+msgid "<b>Frameskip</b>"
+msgstr "<b>Frameskip</b>"
+
+#: ../src/gtk/ui/preferences.ui:37
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
+
+#: ../src/gtk/ui/display.ui:96
+msgid "<b>Output module</b>"
+msgstr "<b>Output module</b>"
+
+#: ../src/gtk/ui/gameboyadvance.ui:225
+msgid "<b>Real-Time Clock</b>"
+msgstr "<b>Real-Time Clock</b>"
+
+#: ../src/gtk/ui/gameboy.ui:105
+msgid "<b>System and peripherals</b>"
+msgstr "<b>System and peripherals</b>"
+
+#: ../src/gtk/ui/cheatedit.ui:80
+msgid "<b>Type</b>"
+msgstr "<b>Type</b>"
+
+#: ../src/gtk/ui/display.ui:151
+msgid "<b>Zoom</b>"
+msgstr "<b>Zoom</b>"
+
+#: ../src/gtk/ui/cheatlist.ui:56
+msgid "Add new cheat"
+msgstr "Add new cheat"
+
+#: ../src/gtk/filters.cpp:65
+msgid "AdvanceMAME Scale2x"
+msgstr "AdvanceMAME Scale2x"
+
+#: ../src/gtk/window.cpp:1256
+msgid "All Gameboy Advance files"
+msgstr "All Gameboy Advance files"
+
+#: ../src/gtk/gameboyadvanceconfig.cpp:75
+msgid "All files"
+msgstr "All files"
+
+#: ../src/gtk/ui/vbam.ui:169
+msgid "Auto load most recent"
+msgstr "Auto load most recent"
+
+#: ../src/gtk/joypadconfig.cpp:42
+msgid "Autofire A :"
+msgstr "Autofire A :"
+
+#: ../src/gtk/joypadconfig.cpp:43
+msgid "Autofire B :"
+msgstr "Autofire B :"
+
+#: ../src/gtk/directoriesconfig.cpp:32
+msgid "Batteries :"
+msgstr "Batteries :"
+
+#: ../src/gtk/filters.cpp:66
+msgid "Bilinear"
+msgstr "Bilinear"
+
+#: ../src/gtk/filters.cpp:67
+msgid "Bilinear Plus"
+msgstr "Bilinear Plus"
+
+#: ../src/gtk/ui/gameboyadvance.ui:163
+msgid "Bios file : "
+msgstr "Bios file : "
+
+#: ../src/gtk/ui/gameboy.ui:140
+msgid "Boot ROM file : "
+msgstr "Boot ROM file : "
+
+#: ../src/gtk/joypadconfig.cpp:34
+msgid "Button A :"
+msgstr "Button A :"
+
+#: ../src/gtk/joypadconfig.cpp:35
+msgid "Button B :"
+msgstr "Button B :"
+
+#: ../src/gtk/joypadconfig.cpp:36
+msgid "Button L :"
+msgstr "Button L :"
+
+#: ../src/gtk/joypadconfig.cpp:37
+msgid "Button R :"
+msgstr "Button R :"
+
+#: ../src/gtk/ui/display.ui:80
+msgid "Cairo"
+msgstr "Cairo"
+
+#: ../src/gtk/joypadconfig.cpp:41
+msgid "Capture :"
+msgstr "Capture :"
+
+#: ../src/gtk/directoriesconfig.cpp:34
+msgid "Captures :"
+msgstr "Captures :"
+
+#: ../src/gtk/ui/cheatlist.ui:9
+msgid "Cheat list"
+msgstr "Cheat list"
+
+#: ../src/gtk/cheatedit.cpp:58
+msgid "CodeBreaker Advance"
+msgstr "CodeBreaker Advance"
+
+#: ../src/gtk/ui/vbam.ui:527
+msgid "D_irectories ..."
+msgstr "D_irectories ..."
+
+#: ../src/gtk/joypadconfig.cpp:50
+msgid "Default joypad"
+msgstr "Default joypad"
+
+#: ../src/gtk/ui/display.ui:122
+msgid "Default scale : "
+msgstr "Default scale : "
+
+#: ../src/gtk/ui/cheatlist.ui:82
+msgid "Delete all cheats"
+msgstr "Delete all cheats"
+
+#: ../src/gtk/ui/cheatlist.ui:69
+msgid "Delete selected cheat"
+msgstr "Delete selected cheat"
+
+#: ../src/gtk/directoriesconfig.cpp:38
+msgid "Directories config"
+msgstr "Directories config"
+
+#: ../src/gtk/ui/gameboy.ui:80
+msgid "Display Super Game Boy borders"
+msgstr "Display Super Game Boy borders"
+
+#: ../src/gtk/joypadconfig.cpp:154
+msgid "Down"
+msgstr "Down"
+
+#: ../src/gtk/joypadconfig.cpp:31
+msgid "Down :"
+msgstr "Down :"
+
+#: ../src/gtk/ui/cheatedit.ui:13
+msgid "Edit cheat"
+msgstr "Edit cheat"
+
+#: ../src/gtk/ui/gameboy.ui:91
+msgid "Emulate a Game Boy Printer"
+msgstr "Emulate a Game Boy Printer"
+
+#: ../src/gtk/ui/gameboy.ui:56
+msgid "Emulated system : "
+msgstr "Emulated system : "
+
+#: ../src/gtk/ui/preferences.ui:62
+msgid "Enable automatic frame skipping"
+msgstr "Enable automatic frame skipping"
+
+#: ../src/gtk/ui/gameboyadvance.ui:214
+msgid "Enable real-time clock"
+msgstr "Enable real-time clock"
+
+#: ../src/gtk/window.cpp:467
+#, c-format
+msgid "Failed to init SDL: %s"
+msgstr "Failed to init SDL: %s"
+
+#: ../src/gtk/windowcallbacks.cpp:149 ../src/gtk/windowcallbacks.cpp:311
+msgid "File already exists. Overwrite it?"
+msgstr "File already exists. Overwrite it?"
+
+#: ../src/gtk/ui/gameboyadvance.ui:102
+msgid "Flash size : "
+msgstr "Flash size : "
+
+#: ../src/gtk/ui/preferences.ui:79
+msgid "Frameskip level : "
+msgstr "Frameskip level : "
+
+#: ../src/gtk/ui/vbam.ui:284
+msgid "From _File ..."
+msgstr "From _File ..."
+
+#: ../src/gtk/ui/display.ui:191
+msgid "Fullscreen filter : "
+msgstr "Fullscreen filter : "
+
+#: ../src/gtk/directoriesconfig.cpp:31
+msgid "GB roms :"
+msgstr "GB roms :"
+
+#: ../src/gtk/directoriesconfig.cpp:30
+msgid "GBA roms :"
+msgstr "GBA roms :"
+
+#: ../src/gtk/ui/gameboyadvance.ui:44
+msgid "Game Boy Advance settings"
+msgstr "Game Boy Advance settings"
+
+#: ../src/gtk/ui/vbam.ui:500
+msgid "Game Boy _Advance ..."
+msgstr "Game Boy _Advance ..."
+
+#: ../src/gtk/ui/gameboy.ui:31
+msgid "GameBoy settings"
+msgstr "GameBoy settings"
+
+#: ../src/gtk/gameboyadvanceconfig.cpp:79
+msgid "Gameboy Advance BIOS"
+msgstr "Gameboy Advance BIOS"
+
+#: ../src/gtk/window.cpp:1263
+msgid "Gameboy Advance files"
+msgstr "Gameboy Advance files"
+
+#: ../src/gtk/window.cpp:1270
+msgid "Gameboy files"
+msgstr "Gameboy files"
+
+#: ../src/gtk/cheatedit.cpp:53
+msgid "Gameshark Advance"
+msgstr "Gameshark Advance"
+
+#: ../src/gtk/cheatedit.cpp:48
+msgid "Generic Code"
+msgstr "Generic Code"
+
+#: ../src/gtk/ui/display.ui:179
+msgid "Interframe blending : "
+msgstr "Interframe blending : "
+
+#: ../src/gtk/filters.cpp:82
+msgid "Interframe motion blur"
+msgstr "Interframe motion blur"
+
+#: ../src/gtk/joypadconfig.cpp:129
+msgid "Joy "
+msgstr "Joy "
+
+#: ../src/gtk/joypadconfig.cpp:49
+msgid "Joypad :"
+msgstr "Joypad :"
+
+#: ../src/gtk/joypadconfig.cpp:47
+msgid "Joypad config"
+msgstr "Joypad config"
+
+#: ../src/gtk/joypadconfig.cpp:156
+msgid "Left"
+msgstr "Left"
+
+#: ../src/gtk/joypadconfig.cpp:32
+msgid "Left :"
+msgstr "Left :"
+
+#: ../src/gtk/ui/vbam.ui:150
+msgid "Loa_d state"
+msgstr "Loa_d state"
+
+#: ../src/gtk/windowcallbacks.cpp:83
+msgid "Load game"
+msgstr "Load game"
+
+#: ../src/gtk/window.cpp:1296
+msgid "Loaded battery"
+msgstr "Loaded battery"
+
+#: ../src/gtk/main.cpp:49
+msgid "Main VBA-M options"
+msgstr "Main VBA-M options"
+
+#: ../src/gtk/ui/vbam.ui:160
+msgid "Most recent"
+msgstr "Most recent"
+
+#: ../src/gtk/windowcallbacks.cpp:498
+msgid "Nintendo GameBoy Advance emulator."
+msgstr "Nintendo GameBoy Advance emulator."
+
+#: ../src/gtk/filters.cpp:60 ../src/gtk/filters.cpp:80
+msgid "None"
+msgstr "None"
+
+#: ../src/gtk/ui/vbam.ui:308
+msgid "Oldest slot"
+msgstr "Oldest slot"
+
+#: ../src/gtk/windowcallbacks.cpp:461
+msgid "Only Gameboy Advance cheats are supported"
+msgstr "Only Gameboy Advance cheats are supported"
+
+#: ../src/gtk/window.cpp:1221
+msgid "Open"
+msgstr "Open"
+
+#: ../src/gtk/cheatlist.cpp:73 ../src/gtk/ui/cheatlist.ui:21
+msgid "Open cheat list"
+msgstr "Open cheat list"
+
+#: ../src/gtk/ui/vbam.ui:45
+msgid "Open rece_nt"
+msgstr "Open rece_nt"
+
+#: ../src/gtk/ui/display.ui:71
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: ../src/gtk/main.cpp:54
+msgid "Output version information."
+msgstr "Output version information."
+
+#: ../src/gtk/windowcallbacks.cpp:293
+msgid "PNG image"
+msgstr "PNG image"
+
+#: ../src/gtk/ui/vbam.ui:112
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/gtk/ui/preferences.ui:25
+msgid "Pause when inactive"
+msgstr "Pause when inactive"
+
+#: ../src/gtk/filters.cpp:64
+msgid "Pixelate"
+msgstr "Pixelate"
+
+#: ../src/gtk/ui/preferences.ui:7
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../src/gtk/joypadconfig.cpp:155
+msgid "Right"
+msgstr "Right"
+
+#: ../src/gtk/joypadconfig.cpp:33
+msgid "Right :"
+msgstr "Right :"
+
+#: ../src/gtk/ui/vbam.ui:298
+msgid "S_ave state"
+msgstr "S_ave state"
+
+#: ../src/gtk/ui/sound.ui:92
+msgid "Sample rate : "
+msgstr "Sample rate : "
+
+#: ../src/gtk/cheatlist.cpp:96 ../src/gtk/ui/cheatlist.ui:34
+msgid "Save cheat list"
+msgstr "Save cheat list"
+
+#: ../src/gtk/windowcallbacks.cpp:116
+msgid "Save game"
+msgstr "Save game"
+
+#: ../src/gtk/windowcallbacks.cpp:276
+msgid "Save screenshot"
+msgstr "Save screenshot"
+
+#: ../src/gtk/ui/gameboyadvance.ui:114
+msgid "Save type : "
+msgstr "Save type : "
+
+#: ../src/gtk/window.cpp:1313
+msgid "Saved battery"
+msgstr "Saved battery"
+
+#: ../src/gtk/directoriesconfig.cpp:33
+msgid "Saves :"
+msgstr "Saves :"
+
+#: ../src/gtk/filters.cpp:68
+msgid "Scanlines"
+msgstr "Scanlines"
+
+#: ../src/gtk/ui/vbam.ui:60
+msgid "Screen capt_ure..."
+msgstr "Screen capt_ure..."
+
+#: ../src/gtk/joypadconfig.cpp:38
+msgid "Select :"
+msgstr "Select :"
+
+#: ../src/gtk/ui/vbam.ui:184 ../src/gtk/ui/vbam.ui:323
+msgid "Slot1"
+msgstr "Slot1"
+
+#: ../src/gtk/ui/vbam.ui:274 ../src/gtk/ui/vbam.ui:413
+msgid "Slot10"
+msgstr "Slot10"
+
+#: ../src/gtk/ui/vbam.ui:194 ../src/gtk/ui/vbam.ui:333
+msgid "Slot2"
+msgstr "Slot2"
+
+#: ../src/gtk/ui/vbam.ui:204 ../src/gtk/ui/vbam.ui:343
+msgid "Slot3"
+msgstr "Slot3"
+
+#: ../src/gtk/ui/vbam.ui:214 ../src/gtk/ui/vbam.ui:353
+msgid "Slot4"
+msgstr "Slot4"
+
+#: ../src/gtk/ui/vbam.ui:224 ../src/gtk/ui/vbam.ui:363
+msgid "Slot5"
+msgstr "Slot5"
+
+#: ../src/gtk/ui/vbam.ui:234 ../src/gtk/ui/vbam.ui:373
+msgid "Slot6"
+msgstr "Slot6"
+
+#: ../src/gtk/ui/vbam.ui:244 ../src/gtk/ui/vbam.ui:383
+msgid "Slot7"
+msgstr "Slot7"
+
+#: ../src/gtk/ui/vbam.ui:254 ../src/gtk/ui/vbam.ui:393
+msgid "Slot8"
+msgstr "Slot8"
+
+#: ../src/gtk/ui/vbam.ui:264 ../src/gtk/ui/vbam.ui:403
+msgid "Slot9"
+msgstr "Slot9"
+
+#: ../src/gtk/filters.cpp:81
+msgid "Smart interframe blending"
+msgstr "Smart interframe blending"
+
+#: ../src/gtk/joypadconfig.cpp:40
+msgid "Speed :"
+msgstr "Speed :"
+
+#: ../src/gtk/ui/preferences.ui:134
+msgid "Speed indicator : "
+msgstr "Speed indicator : "
+
+#: ../src/gtk/joypadconfig.cpp:39
+msgid "Start :"
+msgstr "Start :"
+
+#: ../src/gtk/filters.cpp:62
+msgid "Super 2xSaI"
+msgstr "Super 2xSaI"
+
+#: ../src/gtk/filters.cpp:63
+msgid "Super Eagle"
+msgstr "Super Eagle"
+
+#: ../src/gtk/filters.cpp:69
+msgid "TV Mode"
+msgstr "TV Mode"
+
+#: ../src/gtk/ui/vbam.ui:429
+msgid "To _File ..."
+msgstr "To _File ..."
+
+#: ../src/gtk/ui/cheatlist.ui:103
+msgid "Toggle all Cheats"
+msgstr "Toggle all Cheats"
+
+#: ../src/gtk/window.cpp:426
+#, c-format
+msgid "Unable to initialize output, falling back to Cairo\n"
+msgstr "Unable to initialize output, falling back to Cairo\n"
+
+#: ../src/gtk/window.cpp:975
+#, c-format
+msgid "Unknown file type %s"
+msgstr "Unknown file type %s"
+
+#: ../src/gtk/joypadconfig.cpp:153
+msgid "Up"
+msgstr "Up"
+
+#: ../src/gtk/joypadconfig.cpp:30
+msgid "Up :"
+msgstr "Up :"
+
+#: ../src/gtk/ui/gameboy.ui:130
+msgid "Use a Game Boy boot ROM file"
+msgstr "Use a Game Boy boot ROM file"
+
+#: ../src/gtk/ui/gameboyadvance.ui:153
+msgid "Use a bios file"
+msgstr "Use a bios file"
+
+#: ../src/gtk/ui/vbam.ui:7
+msgid "VBA"
+msgstr "VBA"
+
+#: ../src/gtk/main.cpp:40 ../src/gtk/windowcallbacks.cpp:496
+msgid "VBA-M"
+msgstr "VBA-M"
+
+#: ../src/gtk/window.cpp:1114
+#, c-format
+msgid "VBA-M - %d%%"
+msgstr "VBA-M - %d%%"
+
+#: ../src/gtk/window.cpp:1119
+#, c-format
+msgid "VBA-M - %d%% (%d, %d fps)"
+msgstr "VBA-M - %d%% (%d, %d fps)"
+
+#: ../src/gtk/windowcallbacks.cpp:98 ../src/gtk/windowcallbacks.cpp:133
+msgid "VisualBoyAdvance save game"
+msgstr "VisualBoyAdvance save game"
+
+#: ../src/gtk/main.cpp:80
+#, c-format
+msgid "VisualBoyAdvance version %s [GTK+]\n"
+msgstr "VisualBoyAdvance version %s [GTK+]\n"
+
+#: ../src/gtk/ui/sound.ui:82
+msgid "Volume : "
+msgstr "Volume : "
+
+#: ../src/gtk/ui/vbam.ui:459
+msgid "_Disable cheats"
+msgstr "_Disable cheats"
+
+#: ../src/gtk/ui/vbam.ui:509
+msgid "_Display ..."
+msgstr "_Display ..."
+
+#: ../src/gtk/ui/vbam.ui:102
+msgid "_Emulation"
+msgstr "_Emulation"
+
+#: ../src/gtk/ui/vbam.ui:24
+msgid "_File"
+msgstr "_File"
+
+#: ../src/gtk/ui/vbam.ui:491
+msgid "_Game Boy ..."
+msgstr "_Game Boy ..."
+
+#: ../src/gtk/ui/vbam.ui:549
+msgid "_Help"
+msgstr "_Help"
+
+#: ../src/gtk/ui/vbam.ui:536
+msgid "_Joypads ..."
+msgstr "_Joypads ..."
+
+#: ../src/gtk/ui/vbam.ui:449
+msgid "_List cheats ..."
+msgstr "_List cheats ..."
+
+#: ../src/gtk/ui/vbam.ui:472
+msgid "_Options"
+msgstr "_Options"
+
+#: ../src/gtk/ui/vbam.ui:482
+msgid "_Preferences ..."
+msgstr "_Preferences ..."
+
+#: ../src/gtk/ui/vbam.ui:122
+msgid "_Reset"
+msgstr "_Reset"
+
+#: ../src/gtk/ui/vbam.ui:518
+msgid "_Sound ..."
+msgstr "_Sound ..."
+
+#: ../src/gtk/ui/cheatlist.ui:57
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../src/gtk/ui/display.ui:259 ../src/gtk/ui/gameboy.ui:187
+#: ../src/gtk/ui/gameboyadvance.ui:246 ../src/gtk/ui/preferences.ui:179
+#: ../src/gtk/ui/sound.ui:135
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../src/gtk/ui/cheatlist.ui:70
+msgid "gtk-delete"
+msgstr "gtk-delete"
+
+#: ../src/gtk/ui/cheatlist.ui:104
+msgid "gtk-markall"
+msgstr "gtk-markall"
+
+#: ../src/gtk/ui/cheatlist.ui:22
+msgid "gtk-open"
+msgstr "gtk-open"
+
+#: ../src/gtk/ui/cheatlist.ui:35
+msgid "gtk-save"
+msgstr "gtk-save"
+
+#: ../src/gtk/filters.cpp:70
+msgid "hq2x"
+msgstr "hq2x"
+
+#: ../src/gtk/filters.cpp:71
+msgid "lq2x"
+msgstr "lq2x"
diff --git a/po/gvbam/fr.po b/po/gvbam/fr.po
new file mode 100644
index 00000000..f0c11c7d
--- /dev/null
+++ b/po/gvbam/fr.po
@@ -0,0 +1,680 @@
+# This file is distributed under the same license as the PACKAGE package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VBA-M\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-24 14:05+0100\n"
+"PO-Revision-Date: 2011-02-24 13:56+0000\n"
+"Last-Translator: bgK <bastien.bouclet@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: ../src/gtk/joypadconfig.cpp:142
+msgid " Axis "
+msgstr "Axe"
+
+#: ../src/gtk/joypadconfig.cpp:135
+msgid " Button "
+msgstr "Bouton"
+
+#: ../src/gtk/joypadconfig.cpp:150
+msgid " Hat "
+msgstr "Stick"
+
+#: ../src/gtk/window.cpp:1368
+msgid "%Y/%m/%d %H:%M:%S"
+msgstr "%Y/%m/%d %H:%M:%S"
+
+#: ../src/gtk/screenarea-opengl.cpp:41
+#, c-format
+msgid "*** OpenGL : Cannot open display.\n"
+msgstr "*** OpenGL : Impossible d'initialiser l'affichage.\n"
+
+#: ../src/gtk/window.cpp:1338 ../src/gtk/window.cpp:1383
+msgid "----/--/-- --:--:--"
+msgstr "----/--/-- --:--:--"
+
+#: ../src/gtk/filters.cpp:61
+msgid "2xSaI"
+msgstr "2xSaI"
+
+#: ../src/gtk/joypadconfig.cpp:165
+msgid "<Undefined>"
+msgstr "<Non défini>"
+
+#: ../src/gtk/ui/preferences.ui:163
+msgid "<b>Appearance</b>"
+msgstr "<b>Apparence</b>"
+
+#: ../src/gtk/ui/gameboyadvance.ui:189
+msgid "<b>Bios</b>"
+msgstr "<b>Bios</b>"
+
+#: ../src/gtk/ui/gameboy.ui:166
+msgid "<b>Boot ROM</b>"
+msgstr "<b>ROM de démarrage</b>"
+
+#: ../src/gtk/ui/gameboyadvance.ui:128
+msgid "<b>Cartridge</b>"
+msgstr "<b>Cartouche</b>"
+
+#: ../src/gtk/ui/cheatedit.ui:118
+msgid "<b>Codes</b>"
+msgstr "<b>Codes</b>"
+
+#: ../src/gtk/ui/cheatedit.ui:44
+msgid "<b>Description</b>"
+msgstr "<b>Description</b>"
+
+#: ../src/gtk/ui/display.ui:238
+msgid "<b>Filters</b>"
+msgstr "<b>Filtres</b>"
+
+#: ../src/gtk/ui/preferences.ui:109
+msgid "<b>Frameskip</b>"
+msgstr "<b>Saut d'images</b>"
+
+#: ../src/gtk/ui/preferences.ui:37
+msgid "<b>General</b>"
+msgstr "<b>Transverse</b>"
+
+#: ../src/gtk/ui/display.ui:96
+msgid "<b>Output module</b>"
+msgstr "<b>Module d'affichage</b>"
+
+#: ../src/gtk/ui/gameboyadvance.ui:225
+msgid "<b>Real-Time Clock</b>"
+msgstr "<b>Horloge (RTC)</b>"
+
+#: ../src/gtk/ui/gameboy.ui:105
+msgid "<b>System and peripherals</b>"
+msgstr "<b>Système et périphériques</b>"
+
+#: ../src/gtk/ui/cheatedit.ui:80
+msgid "<b>Type</b>"
+msgstr "<b>Type</b>"
+
+#: ../src/gtk/ui/display.ui:151
+msgid "<b>Zoom</b>"
+msgstr "<b>Zoom</b>"
+
+#: ../src/gtk/ui/cheatlist.ui:56
+msgid "Add new cheat"
+msgstr "Ajouter un code"
+
+#: ../src/gtk/filters.cpp:65
+msgid "AdvanceMAME Scale2x"
+msgstr "AdvanceMAME Scale2x"
+
+#: ../src/gtk/window.cpp:1256
+msgid "All Gameboy Advance files"
+msgstr "Tous les fichiers Gameboy Advance"
+
+#: ../src/gtk/gameboyadvanceconfig.cpp:75
+msgid "All files"
+msgstr "Tous les fichiers"
+
+#: ../src/gtk/ui/vbam.ui:169
+msgid "Auto load most recent"
+msgstr "Charger automatiquement le plus récent"
+
+#: ../src/gtk/joypadconfig.cpp:42
+msgid "Autofire A :"
+msgstr "Tir auto A :"
+
+#: ../src/gtk/joypadconfig.cpp:43
+msgid "Autofire B :"
+msgstr "Tir auto B :"
+
+#: ../src/gtk/directoriesconfig.cpp:32
+msgid "Batteries :"
+msgstr "Batteries :"
+
+#: ../src/gtk/filters.cpp:66
+msgid "Bilinear"
+msgstr "Bilinear"
+
+#: ../src/gtk/filters.cpp:67
+msgid "Bilinear Plus"
+msgstr "Bilinear Plus"
+
+#: ../src/gtk/ui/gameboyadvance.ui:163
+msgid "Bios file : "
+msgstr "Bios : "
+
+#: ../src/gtk/ui/gameboy.ui:140
+msgid "Boot ROM file : "
+msgstr "ROM de démarrage : "
+
+#: ../src/gtk/joypadconfig.cpp:34
+msgid "Button A :"
+msgstr "Bouton A :"
+
+#: ../src/gtk/joypadconfig.cpp:35
+msgid "Button B :"
+msgstr "Bouton B :"
+
+#: ../src/gtk/joypadconfig.cpp:36
+msgid "Button L :"
+msgstr "Bouton L :"
+
+#: ../src/gtk/joypadconfig.cpp:37
+msgid "Button R :"
+msgstr "Bouton R :"
+
+#: ../src/gtk/ui/display.ui:80
+msgid "Cairo"
+msgstr "Cairo"
+
+#: ../src/gtk/joypadconfig.cpp:41
+msgid "Capture :"
+msgstr "Capture :"
+
+#: ../src/gtk/directoriesconfig.cpp:34
+msgid "Captures :"
+msgstr "Captures :"
+
+#: ../src/gtk/ui/cheatlist.ui:9
+msgid "Cheat list"
+msgstr "Liste des codes"
+
+#: ../src/gtk/cheatedit.cpp:58
+msgid "CodeBreaker Advance"
+msgstr "CodeBreaker Advance"
+
+#: ../src/gtk/ui/vbam.ui:527
+msgid "D_irectories ..."
+msgstr "_Répertoires ..."
+
+#: ../src/gtk/joypadconfig.cpp:50
+msgid "Default joypad"
+msgstr "Manette par défaut"
+
+#: ../src/gtk/ui/display.ui:122
+msgid "Default scale : "
+msgstr "Taille par défaut : "
+
+#: ../src/gtk/ui/cheatlist.ui:82
+msgid "Delete all cheats"
+msgstr "Supprimer tous les codes"
+
+#: ../src/gtk/ui/cheatlist.ui:69
+msgid "Delete selected cheat"
+msgstr "Supprimer le code sélectionné"
+
+#: ../src/gtk/directoriesconfig.cpp:38
+msgid "Directories config"
+msgstr "Configuration des répertoires"
+
+#: ../src/gtk/ui/gameboy.ui:80
+msgid "Display Super Game Boy borders"
+msgstr "Afficher les bordures Super Game Boy"
+
+#: ../src/gtk/joypadconfig.cpp:154
+msgid "Down"
+msgstr "Bas"
+
+#: ../src/gtk/joypadconfig.cpp:31
+msgid "Down :"
+msgstr "Bas :"
+
+#: ../src/gtk/ui/cheatedit.ui:13
+msgid "Edit cheat"
+msgstr "Editer le code"
+
+#: ../src/gtk/ui/gameboy.ui:91
+msgid "Emulate a Game Boy Printer"
+msgstr "Emuler une imprimante Game Boy"
+
+#: ../src/gtk/ui/gameboy.ui:56
+msgid "Emulated system : "
+msgstr "Machine émulée : "
+
+#: ../src/gtk/ui/preferences.ui:62
+msgid "Enable automatic frame skipping"
+msgstr "Activer le saut d'image automatique"
+
+#: ../src/gtk/ui/gameboyadvance.ui:214
+msgid "Enable real-time clock"
+msgstr "Activer l'horloge (RTC)"
+
+#: ../src/gtk/window.cpp:467
+#, c-format
+msgid "Failed to init SDL: %s"
+msgstr "Echec à l'initialisation de SDL: %s"
+
+#: ../src/gtk/windowcallbacks.cpp:149 ../src/gtk/windowcallbacks.cpp:311
+msgid "File already exists. Overwrite it?"
+msgstr "Ce fichier existe déjà. Voulez-vous le remplacer ?"
+
+#: ../src/gtk/ui/gameboyadvance.ui:102
+msgid "Flash size : "
+msgstr "Taille mémoire Flash : "
+
+#: ../src/gtk/ui/preferences.ui:79
+msgid "Frameskip level : "
+msgstr "Niveau de saut : "
+
+#: ../src/gtk/ui/vbam.ui:284
+msgid "From _File ..."
+msgstr "Depuis un _fichier ..."
+
+#: ../src/gtk/ui/display.ui:191
+msgid "Fullscreen filter : "
+msgstr "Filtre : "
+
+#: ../src/gtk/directoriesconfig.cpp:31
+msgid "GB roms :"
+msgstr "Roms GB :"
+
+#: ../src/gtk/directoriesconfig.cpp:30
+msgid "GBA roms :"
+msgstr "Roms GBA :"
+
+#: ../src/gtk/ui/gameboyadvance.ui:44
+msgid "Game Boy Advance settings"
+msgstr "Paramètres Game Boy Advance"
+
+#: ../src/gtk/ui/vbam.ui:500
+msgid "Game Boy _Advance ..."
+msgstr "Game Boy _Advance ..."
+
+#: ../src/gtk/ui/gameboy.ui:31
+msgid "GameBoy settings"
+msgstr "Paramètres GameBoy"
+
+#: ../src/gtk/gameboyadvanceconfig.cpp:79
+msgid "Gameboy Advance BIOS"
+msgstr "BIOS Gameboy Advance"
+
+#: ../src/gtk/window.cpp:1263
+msgid "Gameboy Advance files"
+msgstr "Fichiers Gameboy Advance"
+
+#: ../src/gtk/window.cpp:1270
+msgid "Gameboy files"
+msgstr "Fichiers Gameboy"
+
+#: ../src/gtk/cheatedit.cpp:53
+msgid "Gameshark Advance"
+msgstr "Gameshark Advance"
+
+#: ../src/gtk/cheatedit.cpp:48
+msgid "Generic Code"
+msgstr "Code générique"
+
+#: ../src/gtk/ui/display.ui:179
+msgid "Interframe blending : "
+msgstr "Interframe blending : "
+
+#: ../src/gtk/filters.cpp:82
+msgid "Interframe motion blur"
+msgstr "Interframe motion blur"
+
+#: ../src/gtk/joypadconfig.cpp:129
+msgid "Joy "
+msgstr "Joy"
+
+#: ../src/gtk/joypadconfig.cpp:49
+msgid "Joypad :"
+msgstr "Manette :"
+
+#: ../src/gtk/joypadconfig.cpp:47
+msgid "Joypad config"
+msgstr "Configuration de la manette"
+
+#: ../src/gtk/joypadconfig.cpp:156
+msgid "Left"
+msgstr "Gauche"
+
+#: ../src/gtk/joypadconfig.cpp:32
+msgid "Left :"
+msgstr "Gauche :"
+
+#: ../src/gtk/ui/vbam.ui:150
+msgid "Loa_d state"
+msgstr "Char_ger l'état"
+
+#: ../src/gtk/windowcallbacks.cpp:83
+msgid "Load game"
+msgstr "Chargement"
+
+#: ../src/gtk/window.cpp:1296
+msgid "Loaded battery"
+msgstr "Batterie chargée"
+
+#: ../src/gtk/main.cpp:49
+msgid "Main VBA-M options"
+msgstr "VBA-M - Options principales"
+
+#: ../src/gtk/ui/vbam.ui:160
+msgid "Most recent"
+msgstr "Le plus récent"
+
+#: ../src/gtk/windowcallbacks.cpp:498
+msgid "Nintendo GameBoy Advance emulator."
+msgstr "Emulateur de Nindendo GameBoy Advance."
+
+#: ../src/gtk/filters.cpp:60 ../src/gtk/filters.cpp:80
+msgid "None"
+msgstr "Aucun"
+
+#: ../src/gtk/ui/vbam.ui:308
+msgid "Oldest slot"
+msgstr "Le plus ancien"
+
+#: ../src/gtk/windowcallbacks.cpp:461
+msgid "Only Gameboy Advance cheats are supported"
+msgstr "Seuls les codes de triche Gameboy Advance sont supportés."
+
+#: ../src/gtk/window.cpp:1221
+msgid "Open"
+msgstr "Ouvrir"
+
+#: ../src/gtk/cheatlist.cpp:73 ../src/gtk/ui/cheatlist.ui:21
+msgid "Open cheat list"
+msgstr "Charger une liste de codes de triche"
+
+#: ../src/gtk/ui/vbam.ui:45
+msgid "Open rece_nt"
+msgstr "Der_niers jeux"
+
+#: ../src/gtk/ui/display.ui:71
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: ../src/gtk/main.cpp:54
+msgid "Output version information."
+msgstr "Afficher les informations de version"
+
+#: ../src/gtk/windowcallbacks.cpp:293
+msgid "PNG image"
+msgstr "Image PNG"
+
+#: ../src/gtk/ui/vbam.ui:112
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/gtk/ui/preferences.ui:25
+msgid "Pause when inactive"
+msgstr "Mettre en pause quand inactif"
+
+#: ../src/gtk/filters.cpp:64
+msgid "Pixelate"
+msgstr "Pixelate"
+
+#: ../src/gtk/ui/preferences.ui:7
+msgid "Preferences"
+msgstr "Préférences"
+
+#: ../src/gtk/joypadconfig.cpp:155
+msgid "Right"
+msgstr "Droite"
+
+#: ../src/gtk/joypadconfig.cpp:33
+msgid "Right :"
+msgstr "Droite :"
+
+#: ../src/gtk/ui/vbam.ui:298
+msgid "S_ave state"
+msgstr "S_auvegarder l'état"
+
+#: ../src/gtk/ui/sound.ui:92
+msgid "Sample rate : "
+msgstr "Taux d'échantionnage : "
+
+#: ../src/gtk/cheatlist.cpp:96 ../src/gtk/ui/cheatlist.ui:34
+msgid "Save cheat list"
+msgstr "Sauvegarder une liste de codes de triche"
+
+#: ../src/gtk/windowcallbacks.cpp:116
+msgid "Save game"
+msgstr "Sauvegarde"
+
+#: ../src/gtk/windowcallbacks.cpp:276
+msgid "Save screenshot"
+msgstr "Capture d'écran"
+
+#: ../src/gtk/ui/gameboyadvance.ui:114
+msgid "Save type : "
+msgstr "Type de sauvegarde : "
+
+#: ../src/gtk/window.cpp:1313
+msgid "Saved battery"
+msgstr "Batterie sauvegardée"
+
+#: ../src/gtk/directoriesconfig.cpp:33
+msgid "Saves :"
+msgstr "Sauvegardes :"
+
+#: ../src/gtk/filters.cpp:68
+msgid "Scanlines"
+msgstr "Scanlines"
+
+#: ../src/gtk/ui/vbam.ui:60
+msgid "Screen capt_ure..."
+msgstr "Capt_ure d'écran"
+
+#: ../src/gtk/joypadconfig.cpp:38
+msgid "Select :"
+msgstr "Select :"
+
+#: ../src/gtk/ui/vbam.ui:184 ../src/gtk/ui/vbam.ui:323
+msgid "Slot1"
+msgstr "Emplacement1"
+
+#: ../src/gtk/ui/vbam.ui:274 ../src/gtk/ui/vbam.ui:413
+msgid "Slot10"
+msgstr "Emplacement10"
+
+#: ../src/gtk/ui/vbam.ui:194 ../src/gtk/ui/vbam.ui:333
+msgid "Slot2"
+msgstr "Emplacement2"
+
+#: ../src/gtk/ui/vbam.ui:204 ../src/gtk/ui/vbam.ui:343
+msgid "Slot3"
+msgstr "Emplacement3"
+
+#: ../src/gtk/ui/vbam.ui:214 ../src/gtk/ui/vbam.ui:353
+msgid "Slot4"
+msgstr "Emplacement4"
+
+#: ../src/gtk/ui/vbam.ui:224 ../src/gtk/ui/vbam.ui:363
+msgid "Slot5"
+msgstr "Emplacement5"
+
+#: ../src/gtk/ui/vbam.ui:234 ../src/gtk/ui/vbam.ui:373
+msgid "Slot6"
+msgstr "Emplacement6"
+
+#: ../src/gtk/ui/vbam.ui:244 ../src/gtk/ui/vbam.ui:383
+msgid "Slot7"
+msgstr "Emplacement7"
+
+#: ../src/gtk/ui/vbam.ui:254 ../src/gtk/ui/vbam.ui:393
+msgid "Slot8"
+msgstr "Emplacement8"
+
+#: ../src/gtk/ui/vbam.ui:264 ../src/gtk/ui/vbam.ui:403
+msgid "Slot9"
+msgstr "Emplacement9"
+
+#: ../src/gtk/filters.cpp:81
+msgid "Smart interframe blending"
+msgstr "Smart interframe blending"
+
+#: ../src/gtk/joypadconfig.cpp:40
+msgid "Speed :"
+msgstr "Accélération :"
+
+#: ../src/gtk/ui/preferences.ui:134
+msgid "Speed indicator : "
+msgstr "Affichage de la vitesse : "
+
+#: ../src/gtk/joypadconfig.cpp:39
+msgid "Start :"
+msgstr "Start :"
+
+#: ../src/gtk/filters.cpp:62
+msgid "Super 2xSaI"
+msgstr "Super 2xSaI"
+
+#: ../src/gtk/filters.cpp:63
+msgid "Super Eagle"
+msgstr "Super Eagle"
+
+#: ../src/gtk/filters.cpp:69
+msgid "TV Mode"
+msgstr "TV Mode"
+
+#: ../src/gtk/ui/vbam.ui:429
+msgid "To _File ..."
+msgstr "Dans un _fichier ..."
+
+#: ../src/gtk/ui/cheatlist.ui:103
+msgid "Toggle all Cheats"
+msgstr "Inverser l'état de tous les codes"
+
+#: ../src/gtk/window.cpp:426
+#, c-format
+msgid "Unable to initialize output, falling back to Cairo\n"
+msgstr "Impossible d'initialiser l'affichage, utilisation de Cairo\n"
+
+#: ../src/gtk/window.cpp:975
+#, c-format
+msgid "Unknown file type %s"
+msgstr "Type de fichier inconnu %s"
+
+#: ../src/gtk/joypadconfig.cpp:153
+msgid "Up"
+msgstr "Haut"
+
+#: ../src/gtk/joypadconfig.cpp:30
+msgid "Up :"
+msgstr "Haut :"
+
+#: ../src/gtk/ui/gameboy.ui:130
+msgid "Use a Game Boy boot ROM file"
+msgstr "Utiliser une ROM de démarrage GameBoy"
+
+#: ../src/gtk/ui/gameboyadvance.ui:153
+msgid "Use a bios file"
+msgstr "Utiliser un fichier bios"
+
+#: ../src/gtk/ui/vbam.ui:7
+msgid "VBA"
+msgstr "VBA"
+
+#: ../src/gtk/main.cpp:40 ../src/gtk/windowcallbacks.cpp:496
+msgid "VBA-M"
+msgstr "VBA-M"
+
+#: ../src/gtk/window.cpp:1114
+#, c-format
+msgid "VBA-M - %d%%"
+msgstr "VBA-M - %d%%"
+
+#: ../src/gtk/window.cpp:1119
+#, c-format
+msgid "VBA-M - %d%% (%d, %d fps)"
+msgstr "VBA-M - %d%% (%d, %d fps)"
+
+#: ../src/gtk/windowcallbacks.cpp:98 ../src/gtk/windowcallbacks.cpp:133
+msgid "VisualBoyAdvance save game"
+msgstr "Sauvegarde VisualBoyAdvance"
+
+#: ../src/gtk/main.cpp:80
+#, c-format
+msgid "VisualBoyAdvance version %s [GTK+]\n"
+msgstr "VisualBoyAdvance version %s [GTK+]\n"
+
+#: ../src/gtk/ui/sound.ui:82
+msgid "Volume : "
+msgstr "Volume : "
+
+#: ../src/gtk/ui/vbam.ui:459
+msgid "_Disable cheats"
+msgstr "_Désactiver les codes"
+
+#: ../src/gtk/ui/vbam.ui:509
+msgid "_Display ..."
+msgstr "_Affichage ..."
+
+#: ../src/gtk/ui/vbam.ui:102
+msgid "_Emulation"
+msgstr "_Emulation"
+
+#: ../src/gtk/ui/vbam.ui:24
+msgid "_File"
+msgstr "_Fichier"
+
+#: ../src/gtk/ui/vbam.ui:491
+msgid "_Game Boy ..."
+msgstr "_Game Boy ..."
+
+#: ../src/gtk/ui/vbam.ui:549
+msgid "_Help"
+msgstr "_Aide"
+
+#: ../src/gtk/ui/vbam.ui:536
+msgid "_Joypads ..."
+msgstr "_Manettes ..."
+
+#: ../src/gtk/ui/vbam.ui:449
+msgid "_List cheats ..."
+msgstr "_Codes de triche ..."
+
+#: ../src/gtk/ui/vbam.ui:472
+msgid "_Options"
+msgstr "_Options"
+
+#: ../src/gtk/ui/vbam.ui:482
+msgid "_Preferences ..."
+msgstr "_Préférences ..."
+
+#: ../src/gtk/ui/vbam.ui:122
+msgid "_Reset"
+msgstr "_Réinitialiser"
+
+#: ../src/gtk/ui/vbam.ui:518
+msgid "_Sound ..."
+msgstr "_Son ..."
+
+#: ../src/gtk/ui/cheatlist.ui:57
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../src/gtk/ui/display.ui:259 ../src/gtk/ui/gameboy.ui:187
+#: ../src/gtk/ui/gameboyadvance.ui:246 ../src/gtk/ui/preferences.ui:179
+#: ../src/gtk/ui/sound.ui:135
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../src/gtk/ui/cheatlist.ui:70
+msgid "gtk-delete"
+msgstr "gtk-delete"
+
+#: ../src/gtk/ui/cheatlist.ui:104
+msgid "gtk-markall"
+msgstr "gtk-markall"
+
+#: ../src/gtk/ui/cheatlist.ui:22
+msgid "gtk-open"
+msgstr "gtk-open"
+
+#: ../src/gtk/ui/cheatlist.ui:35
+msgid "gtk-save"
+msgstr "gtk-save"
+
+#: ../src/gtk/filters.cpp:70
+msgid "hq2x"
+msgstr "hq2x"
+
+#: ../src/gtk/filters.cpp:71
+msgid "lq2x"
+msgstr "lq2x"
diff --git a/po/update_pot.sh b/po/update_pot.sh
new file mode 100644
index 00000000..a51fb5fc
--- /dev/null
+++ b/po/update_pot.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+intltool-extract --local --type=gettext/glade ../src/gtk/ui/cheatedit.ui
+intltool-extract --local --type=gettext/glade ../src/gtk/ui/cheatlist.ui
+intltool-extract --local --type=gettext/glade ../src/gtk/ui/display.ui
+intltool-extract --local --type=gettext/glade ../src/gtk/ui/gameboyadvance.ui
+intltool-extract --local --type=gettext/glade ../src/gtk/ui/gameboy.ui
+intltool-extract --local --type=gettext/glade ../src/gtk/ui/preferences.ui
+intltool-extract --local --type=gettext/glade ../src/gtk/ui/sound.ui
+intltool-extract --local --type=gettext/glade ../src/gtk/ui/vbam.ui
+
+xgettext -k_ -kN_ -o gvbam.pot ../src/gtk/*.cpp tmp/*.h
diff --git a/src/gtk/joypadconfig.cpp b/src/gtk/joypadconfig.cpp
index e27a8b00..2d3a41fa 100644
--- a/src/gtk/joypadconfig.cpp
+++ b/src/gtk/joypadconfig.cpp
@@ -27,20 +27,20 @@ namespace VBA
 
 const JoypadConfigDialog::SJoypadKey JoypadConfigDialog::m_astKeys[] =
 {
-    { KEY_UP,             _("Up :")         },
-    { KEY_DOWN,           _("Down :")       },
-    { KEY_LEFT,           _("Left :")       },
-    { KEY_RIGHT,          _("Right :")      },
-    { KEY_BUTTON_A,       _("Button A :")   },
-    { KEY_BUTTON_B,       _("Button B :")   },
-    { KEY_BUTTON_L,       _("Button L :")   },
-    { KEY_BUTTON_R,       _("Button R :")   },
-    { KEY_BUTTON_SELECT,  _("Select :")     },
-    { KEY_BUTTON_START,   _("Start :")      },
-    { KEY_BUTTON_SPEED,   _("Speed :")      },
-    { KEY_BUTTON_CAPTURE, _("Capture :")    },
-    { KEY_BUTTON_AUTO_A,  _("Autofire A :") },
-    { KEY_BUTTON_AUTO_B,  _("Autofire B :") }
+    { KEY_UP,             N_("Up :")         },
+    { KEY_DOWN,           N_("Down :")       },
+    { KEY_LEFT,           N_("Left :")       },
+    { KEY_RIGHT,          N_("Right :")      },
+    { KEY_BUTTON_A,       N_("Button A :")   },
+    { KEY_BUTTON_B,       N_("Button B :")   },
+    { KEY_BUTTON_L,       N_("Button L :")   },
+    { KEY_BUTTON_R,       N_("Button R :")   },
+    { KEY_BUTTON_SELECT,  N_("Select :")     },
+    { KEY_BUTTON_START,   N_("Start :")      },
+    { KEY_BUTTON_SPEED,   N_("Speed :")      },
+    { KEY_BUTTON_CAPTURE, N_("Capture :")    },
+    { KEY_BUTTON_AUTO_A,  N_("Autofire A :") },
+    { KEY_BUTTON_AUTO_B,  N_("Autofire B :") }
 };
 
 JoypadConfigDialog::JoypadConfigDialog(Config::Section * _poConfig) :
@@ -65,7 +65,7 @@ JoypadConfigDialog::JoypadConfigDialog(Config::Section * _poConfig) :
   // Joypad buttons
   for (guint i = 0; i < G_N_ELEMENTS(m_astKeys); i++)
   {
-    Gtk::Label * poLabel = Gtk::manage( new Gtk::Label(m_astKeys[i].m_csKeyName, Gtk::ALIGN_RIGHT) );
+    Gtk::Label * poLabel = Gtk::manage( new Gtk::Label(gettext(m_astKeys[i].m_csKeyName), Gtk::ALIGN_RIGHT) );
     Gtk::Entry * poEntry = Gtk::manage( new Gtk::Entry() );
     m_oTable.attach(* poLabel, 0, 1, i, i + 1);
     m_oTable.attach(* poEntry, 1, 2, i, i + 1);
diff --git a/src/gtk/main.cpp b/src/gtk/main.cpp
index 644429c2..b22ce8d8 100644
--- a/src/gtk/main.cpp
+++ b/src/gtk/main.cpp
@@ -34,6 +34,7 @@ int main(int argc, char * argv[])
 
 #ifdef ENABLE_NLS
   setlocale(LC_ALL, "");
+  bindtextdomain("gvbam", LOCALEDIR);
   textdomain("gvbam");
 #endif // ENABLE_NLS
 
diff --git a/src/gtk/ui/cheatlist.ui b/src/gtk/ui/cheatlist.ui
index 922e450d..9baaeb45 100644
--- a/src/gtk/ui/cheatlist.ui
+++ b/src/gtk/ui/cheatlist.ui
@@ -19,7 +19,7 @@
               <object class="GtkToolButton" id="CheatOpenButton">
                 <property name="visible">True</property>
                 <property name="tooltip_text" translatable="yes">Open cheat list</property>
-                <property name="label" translatable="yes">gtk-open</property>
+                <property name="label">gtk-open</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">document-open</property>
               </object>
@@ -32,7 +32,7 @@
               <object class="GtkToolButton" id="CheatSaveButton">
                 <property name="visible">True</property>
                 <property name="tooltip_text" translatable="yes">Save cheat list</property>
-                <property name="label" translatable="yes">gtk-save</property>
+                <property name="label">gtk-save</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">document-save</property>
               </object>
@@ -54,7 +54,7 @@
               <object class="GtkToolButton" id="CheatAddButton">
                 <property name="visible">True</property>
                 <property name="tooltip_text" translatable="yes">Add new cheat</property>
-                <property name="label" translatable="yes">gtk-add</property>
+                <property name="label">gtk-add</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">list-add</property>
               </object>
@@ -67,7 +67,7 @@
               <object class="GtkToolButton" id="CheatRemoveButton">
                 <property name="visible">True</property>
                 <property name="tooltip_text" translatable="yes">Delete selected cheat</property>
-                <property name="label" translatable="yes">gtk-delete</property>
+                <property name="label">gtk-delete</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">list-remove</property>
               </object>
@@ -101,7 +101,7 @@
               <object class="GtkToolButton" id="CheatMarkAllButton">
                 <property name="visible">True</property>
                 <property name="tooltip_text" translatable="yes">Toggle all Cheats</property>
-                <property name="label" translatable="yes">gtk-markall</property>
+                <property name="label">gtk-markall</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">edit-select-all</property>
               </object>
diff --git a/src/gtk/ui/display.ui b/src/gtk/ui/display.ui
index 8e550e54..91d29d6b 100644
--- a/src/gtk/ui/display.ui
+++ b/src/gtk/ui/display.ui
@@ -256,7 +256,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/src/gtk/ui/gameboy.ui b/src/gtk/ui/gameboy.ui
index d3005037..ac2ce5c2 100644
--- a/src/gtk/ui/gameboy.ui
+++ b/src/gtk/ui/gameboy.ui
@@ -7,22 +7,22 @@
     </columns>
     <data>
       <row>
-        <col id="0">Automatic</col>
+        <col id="0" translatable="yes">Automatic</col>
       </row>
       <row>
-        <col id="0">Game Boy Advance</col>
+        <col id="0" translatable="yes">Game Boy Advance</col>
       </row>
       <row>
-        <col id="0">Game Boy Color</col>
+        <col id="0" translatable="yes">Game Boy Color</col>
       </row>
       <row>
-        <col id="0">Super Game Boy</col>
+        <col id="0" translatable="yes">Super Game Boy</col>
       </row>
       <row>
-        <col id="0">Super Game Boy 2</col>
+        <col id="0" translatable="yes">Super Game Boy 2</col>
       </row>
       <row>
-        <col id="0">Game Boy</col>
+        <col id="0" translatable="yes">Game Boy</col>
       </row>
     </data>
   </object>
@@ -184,7 +184,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/src/gtk/ui/gameboyadvance.ui b/src/gtk/ui/gameboyadvance.ui
index d1a91e25..346d2fb7 100644
--- a/src/gtk/ui/gameboyadvance.ui
+++ b/src/gtk/ui/gameboyadvance.ui
@@ -20,22 +20,22 @@
     </columns>
     <data>
       <row>
-        <col id="0">Automatic</col>
+        <col id="0" translatable="yes">Automatic</col>
       </row>
       <row>
-        <col id="0">EEPROM</col>
+        <col id="0" translatable="yes">EEPROM</col>
       </row>
       <row>
-        <col id="0">SRAM</col>
+        <col id="0" translatable="yes">SRAM</col>
       </row>
       <row>
-        <col id="0">Flash</col>
+        <col id="0" translatable="yes">Flash</col>
       </row>
       <row>
-        <col id="0">EEPROM + Sensor</col>
+        <col id="0" translatable="yes">EEPROM + Sensor</col>
       </row>
       <row>
-        <col id="0">None</col>
+        <col id="0" translatable="yes">None</col>
       </row>
     </data>
   </object>
@@ -243,7 +243,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/src/gtk/ui/preferences.ui b/src/gtk/ui/preferences.ui
index cee90dab..00e44855 100644
--- a/src/gtk/ui/preferences.ui
+++ b/src/gtk/ui/preferences.ui
@@ -176,7 +176,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/src/gtk/ui/sound.ui b/src/gtk/ui/sound.ui
index bf0a8790..cb0906f0 100644
--- a/src/gtk/ui/sound.ui
+++ b/src/gtk/ui/sound.ui
@@ -7,19 +7,19 @@
     </columns>
     <data>
       <row>
-        <col id="0">Mute</col>
+        <col id="0" translatable="yes">Mute</col>
       </row>
       <row>
-        <col id="0">25 %</col>
+        <col id="0" translatable="yes">25 %</col>
       </row>
       <row>
-        <col id="0">50 %</col>
+        <col id="0" translatable="yes">50 %</col>
       </row>
       <row>
-        <col id="0">100 %</col>
+        <col id="0" translatable="yes">100 %</col>
       </row>
       <row>
-        <col id="0">200 %</col>
+        <col id="0" translatable="yes">200 %</col>
       </row>
     </data>
   </object>
@@ -132,7 +132,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/src/gtk/ui/vbam.ui b/src/gtk/ui/vbam.ui
index ca43302e..3d694d11 100644
--- a/src/gtk/ui/vbam.ui
+++ b/src/gtk/ui/vbam.ui
@@ -546,7 +546,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes" context="gtk20">_Help</property>
+                <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="HelpMenu_menu">