16 files changed, 206 insertions, 206 deletions

diff --git a/po/POTFILES b/po/POTFILES
index 48e2e58d3e..8ba37f7bf3 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -30,17 +30,17 @@ engines/cruise/menu.cpp
 engines/sci/engine/kfile.cpp
 engines/agos/saveload.cpp
 
-sound/fmopl.cpp
-sound/musicplugin.cpp
-sound/null.h
-sound/null.cpp
-sound/mods/paula.cpp
-sound/softsynth/adlib.cpp
-sound/softsynth/appleiigs.cpp
-sound/softsynth/sid.cpp
-sound/softsynth/mt32.cpp
-sound/softsynth/pcspk.cpp
-sound/softsynth/ym2612.cpp
+audio/fmopl.cpp
+audio/musicplugin.cpp
+audio/null.h
+audio/null.cpp
+audio/mods/paula.cpp
+audio/softsynth/adlib.cpp
+audio/softsynth/appleiigs.cpp
+audio/softsynth/sid.cpp
+audio/softsynth/mt32.cpp
+audio/softsynth/pcspk.cpp
+audio/softsynth/ym2612.cpp
 
 backends/keymapper/remap-dialog.cpp
 backends/midi/windows.cpp
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 0b654ac4b8..993aee9874 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -157,7 +157,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<per defecte>"
 
@@ -1776,51 +1776,51 @@ msgstr "Desa la partida:"
 msgid "Restore"
 msgstr "Restaura"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulador OPL de MAME"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulador OPL DOSBox"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Sense música"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulador d'àudio Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulador d'AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulador d'Apple II GS (NO IMPLEMENTAT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulador d'àudio C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Iniciant l'Emulador de MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulador de MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulador Altaveu PC"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulador d'IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulador de FM Towns"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 69be496a79..865e9647ff 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -159,7 +159,7 @@ msgstr "Jazyk hry. Toto z Va¹í ©panìlské verze neudìlá Anglickou"
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<výchozí>"
 
@@ -1746,51 +1746,51 @@ msgstr "Obnovit hru"
 msgid "Restore"
 msgstr "Obnovit"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL Emulátor"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL Emulátor"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Bez hudby"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulátor zvuku Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib Emulátor"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS Emulátor (NENÍ ZAVEDEN)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulátor zvuku C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Spou¹tím MT-32 Emulátor"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 Emulátor"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker Emulátor"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr Emulátor"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns Emulátor"
 
diff --git a/po/da_DA.po b/po/da_DA.po
index d1b8bb7a7f..429d4493cb 100644
--- a/po/da_DA.po
+++ b/po/da_DA.po
@@ -157,7 +157,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<standard>"
 
@@ -1743,51 +1743,51 @@ msgstr "Gendan spil:"
 msgid "Restore"
 msgstr "Gendan"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL emulator"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL emulator"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Ingen musik"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga lyd emulator"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib emulator"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS emulator (IKKE IMPLEMENTERET)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 lyd emulator"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Initialisere MT-32 emulator"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 emulator"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker emulator"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr emulator"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns emulator"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 79af360652..a3a7cdfd23 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -159,7 +159,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<Standard>"
 
@@ -1757,51 +1757,51 @@ msgstr "Spiel laden:"
 msgid "Restore"
 msgstr "Laden"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME-OPL-Emulator"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox-OPL-Emulator"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Keine Musik"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga-Audio-Emulator"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib-Emulator"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple-II-GS-Emulator (NICHT INTEGRIERT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64-Audio-Emulator"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "MT-32-Emulator wird gestartet..."
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32-Emulation"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC-Lautsprecher-Emulator"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM-PCjr-Emulator"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM-Towns-Emulator"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 6e954d54fd..8b3c57fdb0 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -157,7 +157,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<por defecto>"
 
@@ -1770,51 +1770,51 @@ msgstr "Cargar partida:"
 msgid "Restore"
 msgstr "Cargar"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulador OPL de MAME"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulador OPL de DOSBox"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Sin música"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulador de Amiga Audio"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulador de AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulador de Apple II GS (NO IMPLEMENTADO)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulador de C64 Audio"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Iniciando emulador de MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulador de MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulador del altavoz de PC"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulador de IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulador de FM Towns"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index f2785b3e63..cdadf119cd 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -158,7 +158,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<defaut>"
 
@@ -1760,51 +1760,51 @@ msgstr "Charger le jeu:"
 msgid "Restore"
 msgstr "Charger"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Émulateur MAME OPL"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Émulateur DOSBox OPL"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Pas de musique"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Émulateur Amiga Audio"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Émulateur AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Émulateur Apple II GS (PAS IMPLÉMENTÉ)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Émulateur C64 Audio"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Initialisation de l'Émulateur MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Émulateur MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Émulateur Haut Parleur PC"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Émulateur IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Émulateur FM Towns"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index fc282f9dbb..80b40da1f4 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -159,7 +159,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<alapértelmezett>"
 
@@ -1745,51 +1745,51 @@ msgstr "Játékmenet visszaállítása:"
 msgid "Restore"
 msgstr "Visszaállítás"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL emulátor"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL emulátor"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Nincs zene"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga Audió Emulátor"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib Emulátor"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS Emulátor (NEM TÁMOGATOTT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 Audio Emulátor"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "MT-32 Emulátor inicializálás"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 Emulátor"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker Emulátor"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr Emulátor"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns Emulátor"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 2f2da61979..705a6b4fb4 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -156,7 +156,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<predefinito>"
 
@@ -1771,51 +1771,51 @@ msgstr "Ripristina gioco:"
 msgid "Restore"
 msgstr "Ripristina"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulatore OPL MAME"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulatore OPL DOSBox"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Nessuna musica"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulatore audio Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulatore AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulatore Apple II GS (NON IMPLEMENTATO)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulatore audio C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Avvio in corso dell'emulatore MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulatore MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulatore PC Speaker"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulatore IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulatore FM Towns"
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 7b9c61744a..54bc891595 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -161,7 +161,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<standard>"
 
@@ -1747,51 +1747,51 @@ msgstr "Gjennopprett spill:"
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL emulator"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL emulator"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Ingen musikk"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga Lydemulator"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib Emulator"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS Emulator (IKKE IMPLEMENTERT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 Lydemulator"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Initialiserer MT-32-Emulator"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 Emulator"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker Emulator"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr Emulator"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns Emulator"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index f690618228..7b2c54eed8 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -161,7 +161,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<standard>"
 
@@ -1741,51 +1741,51 @@ msgstr "Gjenopprett spel:"
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL emulator"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL emulator"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Ingen musikk"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga Lydemulator"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib Emulator"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS Emulator (IKKJE IMPLEMENTERT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 Lydemulator"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Initialiserar MT-32-emulator"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 Emulator"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker Emulator"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr Emulator"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns Emulator"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index c9f8b2caf0..6d27cc8c65 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -159,7 +159,7 @@ msgstr "Jêzyk gry. Nie zmieni to hiszpañskiej wersji gry w angielsk±."
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<domy¶lne>"
 
@@ -1747,51 +1747,51 @@ msgstr "Wznów grê:"
 msgid "Restore"
 msgstr "Wznów"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulator OPL MAME"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulator OPL DOSBox"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Brak muzyki"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulator d¼wiêku Amigi"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulator AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulator Apple II GS (NIE ZAIMPLEMENTOWANY)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulator d¼wiêku C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Inicjalizacja emulatora MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulator MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulator brzêczyka"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulator IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulator FM Towns"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 193967446f..3c477faa88 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -159,7 +159,7 @@ msgstr "Idioma do jogo. Isto não irá passar seu jogo Inglês para Português"
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<padrão>"
 
@@ -1754,51 +1754,51 @@ msgstr "Restaurar jogo:"
 msgid "Restore"
 msgstr "Restaurar"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulador MAME OPL"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulador DOSBox OPL"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Sem música"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulador Som Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulador AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulador Apple II GS (NÃO IMPLEMENTADO)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulador Som C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Inicializando Emulador MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulador MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulador PC Speaker"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulador IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulador FM Towns"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0148944466..01f73849d4 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -159,7 +159,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<ßÞ ãÜÞÛçÐÝØî>"
 
@@ -1773,51 +1773,51 @@ msgstr "²ÞááâÐÝÞÒØâì ØÓàã: "
 msgid "Restore"
 msgstr "²ÞááâÒÝÞÒØâì"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "ÍÜãÛïâÞà MAME OPL"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "ÍÜãÛïâÞà DOSBox OPL"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "±Õ× Üã×ëÚØ"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "ÍÜãÛïâÞà ×ÒãÚÐ Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "ÍÜãÛïâÞà AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "ÍÜãÛïâÞà Apple II GS (ÞâáãâáâÒãÕâ)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "ÍÜãÛïâÞà ×ÒãÚÐ C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "½ÐáâàÐØÒÐî íÜãÛïâÞà MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "ÍÜãÛïâÞà MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "ÍÜãÛïâÞà PC áßØÚÕàÐ"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "ÍÜãÛïâÞà IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "ÍÜãÛïâÞà FM Towns"
 
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 523d48ee1e..e1be51f70b 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -153,7 +153,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr ""
 
@@ -1721,51 +1721,51 @@ msgstr ""
 msgid "Restore"
 msgstr ""
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr ""
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr ""
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr ""
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr ""
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr ""
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr ""
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr ""
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr ""
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr ""
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr ""
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr ""
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 56d1880e1f..50e7871355 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -159,7 +159,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<×Ð ãÜÞÒçÐÝÝïÜ>"
 
@@ -1769,51 +1769,51 @@ msgstr "²öÔÝÞÒØâØ Óàã: "
 msgid "Restore"
 msgstr "²öÔÝÞÒØâØ"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "µÜãÛïâÞà MAME OPL:"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "µÜãÛïâÞà DOSBox OPL"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "±Õ× Üã×ØÚØ"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "°ÜöÓÐ °ãÔöÞ µÜãÛïâÞà"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "µÜãÛïâÞà AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS µÜãÛïâÞà (½µ Àµ°»¦·¾²°½¾)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 °ãÔöÞ µÜãÛïâÞà"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "½ÐáâàÞîî ÕÜãÛïâÞà MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "µÜãÛïâÞà MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "µÜãÛïâÞà PC áßöÚÕàÐ"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "µÜãÛïâÞà IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "µÜãÛïâÞà FM Towns"