diff --git a/po/ar.po b/po/ar.po
index 7273771ddff..b93940e5222 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2222,7 +2222,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "ا&سم الملف:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "استعر&ض..."
 
@@ -10328,7 +10328,7 @@ msgstr "تما&ثلية"
 msgid "Digi&tal"
 msgstr "ر&قمية"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "ال&خط..."
 
@@ -14632,10 +14632,18 @@ msgid "C&olor:"
 msgstr "اللو&ن:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "الم&جلدات"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "موص&ول إلى:"
 
diff --git a/po/bg.po b/po/bg.po
index c442c718465..d3e7eafbd0a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2247,7 +2247,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Файл"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 #, fuzzy
 msgid "B&rowse..."
 msgstr "Избор..."
@@ -10270,7 +10270,7 @@ msgstr ""
 msgid "Digi&tal"
 msgstr ""
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Шрифт..."
 
@@ -14130,11 +14130,19 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 #, fuzzy
 msgid "Folders"
 msgstr "Папка"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Връзка към:"
 
diff --git a/po/ca.po b/po/ca.po
index 899c097c7a8..f2bd9813c72 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2235,7 +2235,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "Nom de &fitxer:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Navega..."
 
@@ -10285,7 +10285,7 @@ msgstr "Ana&lògic"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "T&ipus de lletra..."
 
@@ -14370,10 +14370,18 @@ msgid "C&olor:"
 msgstr "Co&lor:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Carpetes"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Enlla&ça a:"
 
diff --git a/po/cs.po b/po/cs.po
index 2acfbc95d93..f2b264dcda7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2218,7 +2218,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Název souboru:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "P&rocházet..."
 
@@ -10148,7 +10148,7 @@ msgstr "Ana&logové"
 msgid "Digi&tal"
 msgstr "Digi&tální"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Písmo..."
 
@@ -14101,10 +14101,18 @@ msgid "C&olor:"
 msgstr "B&arva:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Adresáře"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Odkaz do:"
 
diff --git a/po/da.po b/po/da.po
index a90934a8015..06bb622fe42 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2240,7 +2240,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Filnavn:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Gennemse..."
 
@@ -10447,7 +10447,7 @@ msgstr "&Analog"
 msgid "Digi&tal"
 msgstr "&Digital"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Skrifttype..."
 
@@ -14601,10 +14601,18 @@ msgid "C&olor:"
 msgstr "F&arve:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Mapper"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Link til:"
 
diff --git a/po/de.po b/po/de.po
index 3187a45e93c..dcde9a9c8c1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2229,7 +2229,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Dateiname:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Wählen..."
 
@@ -10234,7 +10234,7 @@ msgstr "Ana&log"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "Schrift&art..."
 
@@ -14314,10 +14314,18 @@ msgid "C&olor:"
 msgstr "F&arbe:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Ordner"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Verknüpfe:"
 
diff --git a/po/el.po b/po/el.po
index fa849e9522c..fc04f611845 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2203,7 +2203,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Περιεχόμενα"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -10077,7 +10077,7 @@ msgstr ""
 msgid "Digi&tal"
 msgstr ""
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr ""
 
@@ -13792,11 +13792,19 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 #, fuzzy
 msgid "Folders"
 msgstr "Κατάλογοι Συστήματος"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/en.po b/po/en.po
index 668570b289d..fd3027497cf 100644
--- a/po/en.po
+++ b/po/en.po
@@ -2223,7 +2223,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&File name:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "B&rowse..."
 
@@ -10177,7 +10177,7 @@ msgstr "Ana&logue"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Font..."
 
@@ -14208,10 +14208,18 @@ msgid "C&olor:"
 msgstr "C&olour:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr "MIME types"
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr "Manage file &associations"
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Folders"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Link to:"
 
diff --git a/po/en_US.po b/po/en_US.po
index d21599db504..009cb5dc25d 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -2223,7 +2223,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&File name:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "B&rowse..."
 
@@ -10177,7 +10177,7 @@ msgstr "Ana&log"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Font..."
 
@@ -14208,10 +14208,18 @@ msgid "C&olor:"
 msgstr "C&olor:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr "MIME types"
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr "Manage file &associations"
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Folders"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Link to:"
 
diff --git a/po/eo.po b/po/eo.po
index c429dc849cf..77f735e7dfa 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2206,7 +2206,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Dosiernomo:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Foliumi..."
 
@@ -10027,7 +10027,7 @@ msgstr "Ana&loga"
 msgid "Digi&tal"
 msgstr "&Cifereca"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Tiparo..."
 
@@ -13806,10 +13806,18 @@ msgid "C&olor:"
 msgstr "&Koloro:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Dosierujoj"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 43838bf8682..a6ca20f8d5d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2244,7 +2244,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "Nombre de &fichero:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "Explo&rar..."
 
@@ -10496,7 +10496,7 @@ msgstr "&Analógico"
 msgid "Digi&tal"
 msgstr "&Digital"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Fuente..."
 
@@ -14692,10 +14692,18 @@ msgid "C&olor:"
 msgstr "C&olor:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Carpeta"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "E&nlace a:"
 
diff --git a/po/fa.po b/po/fa.po
index ce7385c71fa..ec69b06f019 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2235,7 +2235,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&پرونده"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -10060,7 +10060,7 @@ msgstr ""
 msgid "Digi&tal"
 msgstr ""
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&قلم‌ها..."
 
@@ -13791,10 +13791,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 66b5ca5dfdd..54a636b4610 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2221,7 +2221,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Tiedostonimi:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Selaa..."
 
@@ -10161,7 +10161,7 @@ msgstr "&Analoginen"
 msgid "Digi&tal"
 msgstr "Di&gitaalinen"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Fontti..."
 
@@ -14182,10 +14182,18 @@ msgid "C&olor:"
 msgstr "&Väri:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Kansiot"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Linkitä kohteeseen:"
 
diff --git a/po/fr.po b/po/fr.po
index 650728d5252..3c6c69e39c2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2235,7 +2235,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Nom du fichier :"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "Parcou&rir..."
 
@@ -10380,7 +10380,7 @@ msgstr "Ana&logique"
 msgid "Digi&tal"
 msgstr "&Numérique"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Police..."
 
@@ -14638,10 +14638,18 @@ msgid "C&olor:"
 msgstr "Couleu&r :"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Dossiers"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Lier à :"
 
diff --git a/po/he.po b/po/he.po
index e69f8d8c196..e6a4f98ad60 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2248,7 +2248,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&שם הקובץ:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 #, fuzzy
 msgid "B&rowse..."
 msgstr "&עיון"
@@ -10463,7 +10463,7 @@ msgstr "&אנלוגי"
 msgid "Digi&tal"
 msgstr "&דיגיטלי"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&גופן..."
 
@@ -14331,11 +14331,19 @@ msgid "C&olor:"
 msgstr "&צבע"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 #, fuzzy
 msgid "Folders"
 msgstr "תיקייה"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 #, fuzzy
 msgid "&Link to:"
 msgstr "קישורים אל"
diff --git a/po/hi.po b/po/hi.po
index 0506e450be6..e510f447b12 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2186,7 +2186,7 @@ msgstr ""
 msgid "&File name:"
 msgstr ""
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -9888,7 +9888,7 @@ msgstr "एनालॉग (&l)"
 msgid "Digi&tal"
 msgstr "डिज़िटल (&t)"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "फ़ॉन्ट (&F)..."
 
@@ -13540,10 +13540,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index c565cdf7922..c1e022f3c69 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "Naziv &datoteke:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "N&ađi..."
 
@@ -10238,7 +10238,7 @@ msgstr "&Analogni"
 msgid "Digi&tal"
 msgstr "&Digitalni"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Font..."
 
@@ -14062,10 +14062,18 @@ msgid "C&olor:"
 msgstr "B&oja:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Mape"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Veza do:"
 
diff --git a/po/hu.po b/po/hu.po
index 833353c2917..42c711d466f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2241,7 +2241,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Fájlnév:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "Tallózás..."
 
@@ -10427,7 +10427,7 @@ msgstr "Ana&lóg"
 msgid "Digi&tal"
 msgstr "Digi&tális"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Betűtípus..."
 
@@ -14597,10 +14597,18 @@ msgid "C&olor:"
 msgstr "Szín:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Rendszermappák"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Mappa &útvonal:"
 
diff --git a/po/it.po b/po/it.po
index f42d8ea7c94..3e406b62d6d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2251,7 +2251,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "Nome del &file:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Naviga..."
 
@@ -10506,7 +10506,7 @@ msgstr "Ana&logico"
 msgid "Digi&tal"
 msgstr "Digi&tale"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Carattere..."
 
@@ -14694,10 +14694,18 @@ msgid "C&olor:"
 msgstr "C&olore:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Cartelle"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Collega a:"
 
diff --git a/po/ja.po b/po/ja.po
index 87824e6c0c0..bbf551a1e2f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2228,7 +2228,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "ファイル名(&F):"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "参照(&R)..."
 
@@ -10174,7 +10174,7 @@ msgstr "アナログ(&L)"
 msgid "Digi&tal"
 msgstr "デジタル(&T)"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "フォント(&F)..."
 
@@ -14198,10 +14198,18 @@ msgid "C&olor:"
 msgstr "色(&O):"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "フォルダ"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "リンク先(&L):"
 
diff --git a/po/ko.po b/po/ko.po
index 6bd11107149..7b8c4a4fa33 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "파일 이름(&F):"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "찾기(&R)..."
 
@@ -10183,7 +10183,7 @@ msgstr "아날로그(&L)"
 msgid "Digi&tal"
 msgstr "디지털(&T)"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "글꼴(&F)..."
 
@@ -14359,10 +14359,18 @@ msgid "C&olor:"
 msgstr "색상(&O):"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "폴더"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "연결 위치(&L):"
 
diff --git a/po/lt.po b/po/lt.po
index 9dc50657d8d..43f2b0eeee5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Failas:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "Pari&nkti..."
 
@@ -10179,7 +10179,7 @@ msgstr "Ana&loginis"
 msgid "Digi&tal"
 msgstr "Skai&tmeninis"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "Š&riftas..."
 
@@ -14216,10 +14216,18 @@ msgid "C&olor:"
 msgstr "S&palva:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Aplankai"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "S&usieti su:"
 
diff --git a/po/ml.po b/po/ml.po
index 73d51cd898a..d979fdd458f 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -2186,7 +2186,7 @@ msgstr ""
 msgid "&File name:"
 msgstr ""
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -9888,7 +9888,7 @@ msgstr "_അനലോഗ്"
 msgid "Digi&tal"
 msgstr "_ഡിജിറ്റല്‍"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "_അക്ഷരസഞ്ചയം..."
 
@@ -13540,10 +13540,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 2530f94ce12..8a7b0a2634d 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -2226,7 +2226,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Filnavn:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Bla..."
 
@@ -10175,7 +10175,7 @@ msgstr "Ana&log"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "Skri&ft..."
 
@@ -14213,10 +14213,18 @@ msgid "C&olor:"
 msgstr "&Farge:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Mappe"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Pek ti&l:"
 
diff --git a/po/nl.po b/po/nl.po
index db6620ab016..46f18a52d39 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2236,7 +2236,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "Bestands&naam:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "Bladeren..."
 
@@ -10464,7 +10464,7 @@ msgstr "&Analoog"
 msgid "Digi&tal"
 msgstr "&Digitaal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Lettertype..."
 
@@ -14620,10 +14620,18 @@ msgid "C&olor:"
 msgstr "Kleur:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Mappen"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Verwijs naar:"
 
diff --git a/po/or.po b/po/or.po
index 2a12cb2f70e..fd67c40cf42 100644
--- a/po/or.po
+++ b/po/or.po
@@ -2186,7 +2186,7 @@ msgstr ""
 msgid "&File name:"
 msgstr ""
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -9888,7 +9888,7 @@ msgstr "ଆନାଲଗ ‍‌(&l)"
 msgid "Digi&tal"
 msgstr "ଡିଜିଟାଲ (&)"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "ଅକ୍ଷରରୂପ (&F)..."
 
@@ -13540,10 +13540,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index fa03879765c..fbd42c06849 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2186,7 +2186,7 @@ msgstr ""
 msgid "&File name:"
 msgstr ""
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -9888,7 +9888,7 @@ msgstr "ਐਨਾਲਾਗ(&l)"
 msgid "Digi&tal"
 msgstr "ਡਿਜ਼ੀਟਲ(&t)"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "ਫੌਂਟ(&F)..."
 
@@ -13540,10 +13540,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 8624a4607a4..4ce70b12330 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2235,7 +2235,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Nazwa pliku:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "P&rzeglądaj..."
 
@@ -10252,7 +10252,7 @@ msgstr "Ana&logowy"
 msgid "Digi&tal"
 msgstr "C&yfrowy"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Czcionka..."
 
@@ -14292,10 +14292,18 @@ msgid "C&olor:"
 msgstr "K&olor:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Katalogi"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Dowiązany do:"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 00c67b3460e..59bf688ca26 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2231,7 +2231,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "Nome do &arquivo:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Navegar..."
 
@@ -10331,7 +10331,7 @@ msgstr "&Analógico"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Fonte..."
 
@@ -14543,10 +14543,18 @@ msgid "C&olor:"
 msgstr "C&or:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Pastas"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Atalho para:"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9b75d6b3cad..878018b29cd 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -2243,7 +2243,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Nome do ficheiro:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "P&rocurar..."
 
@@ -10232,7 +10232,7 @@ msgstr "&Analógico"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "Tipo de &Letra..."
 
@@ -14255,10 +14255,18 @@ msgid "C&olor:"
 msgstr "C&or:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Pastas"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Ligar a:"
 
diff --git a/po/rm.po b/po/rm.po
index 267f50087b7..1f66690ce6f 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -2212,7 +2212,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Datoteca"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -9966,7 +9966,7 @@ msgstr ""
 msgid "Digi&tal"
 msgstr ""
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr ""
 
@@ -13662,10 +13662,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 7596ea0a4be..8a5151e33d0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2212,7 +2212,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "Nume &fișier:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Navighează..."
 
@@ -10345,7 +10345,7 @@ msgstr "Ana&logic"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Font..."
 
@@ -14379,10 +14379,18 @@ msgid "C&olor:"
 msgstr "Culoare:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Dosare"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Leagă la:"
 
diff --git a/po/ru.po b/po/ru.po
index ad075947307..6a4c3c848fc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "Имя &файла:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Обзор..."
 
@@ -10177,7 +10177,7 @@ msgstr "&Аналоговые"
 msgid "Digi&tal"
 msgstr "&Цифровые"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Шрифт..."
 
@@ -14204,10 +14204,18 @@ msgid "C&olor:"
 msgstr "Цвет:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Папки"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Привязать к:"
 
diff --git a/po/sk.po b/po/sk.po
index ddd3a0d032c..a48d2bf7188 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2231,7 +2231,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Súbor:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "P&rechádzaj..."
 
@@ -10154,7 +10154,7 @@ msgstr "Ana&lógové"
 msgid "Digi&tal"
 msgstr "Digi&tálne"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr ""
 
@@ -13979,11 +13979,19 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 #, fuzzy
 msgid "Folders"
 msgstr "Systémové adresáre"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index acb4a9f267a..9c97c88afcc 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2246,7 +2246,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Ime datoteke:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "B&rskaj ..."
 
@@ -10461,7 +10461,7 @@ msgstr "Ana&logna ura"
 msgid "Digi&tal"
 msgstr "Digi&talna ura"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Pisava ..."
 
@@ -14623,10 +14623,18 @@ msgid "C&olor:"
 msgstr "B&arva:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Mape"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Poveži z:"
 
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 0a5a6c261eb..490cd300611 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -2252,7 +2252,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Датотека"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 #, fuzzy
 msgid "B&rowse..."
 msgstr ""
@@ -10493,7 +10493,7 @@ msgstr "&Аналогни"
 msgid "Digi&tal"
 msgstr "&Дигитални"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Фонт..."
 
@@ -14402,11 +14402,19 @@ msgid "C&olor:"
 msgstr "&Колона"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 #, fuzzy
 msgid "Folders"
 msgstr "Нова фасцикла"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 #, fuzzy
 msgid "&Link to:"
 msgstr "Везе"
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index e41d8c35f6b..691ab5060b8 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -2327,7 +2327,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Datoteka"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "N&ađi..."
 
@@ -10615,7 +10615,7 @@ msgstr "&Analogni"
 msgid "Digi&tal"
 msgstr "&Digitalni"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr ""
 
@@ -14575,11 +14575,19 @@ msgid "C&olor:"
 msgstr "B&oja:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 #, fuzzy
 msgid "Folders"
 msgstr "Fascikla:"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Veza do:"
 
diff --git a/po/sv.po b/po/sv.po
index 620d42e57b3..dbe2ff2103e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Filnamn:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "B&läddra..."
 
@@ -10207,7 +10207,7 @@ msgstr "Ana&log"
 msgid "Digi&tal"
 msgstr "Digi&tal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "T&ypsnitt..."
 
@@ -14247,10 +14247,18 @@ msgid "C&olor:"
 msgstr "Fä&rg:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Mappar"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Länka till:"
 
diff --git a/po/te.po b/po/te.po
index c7b826fd31f..b0923977a35 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2186,7 +2186,7 @@ msgstr ""
 msgid "&File name:"
 msgstr ""
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -9888,7 +9888,7 @@ msgstr "ఎనలాగ్ (&l)"
 msgid "Digi&tal"
 msgstr "డిజిటల్ (&t)"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "ఫాంట్ (&F)..."
 
@@ -13540,10 +13540,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 46d2d7176dc..eef4e16717a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2207,7 +2207,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "แฟ้ม"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -10101,7 +10101,7 @@ msgstr "ธรรมดา"
 msgid "Digi&tal"
 msgstr "ดิจิตัล"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 #, fuzzy
 msgid "&Font..."
 msgstr ""
@@ -13847,11 +13847,19 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 #, fuzzy
 msgid "Folders"
 msgstr "ขอบกระดาษ"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 9a27081119e..30fd87710cd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Dosya adı:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Gözat..."
 
@@ -10212,7 +10212,7 @@ msgstr "Ana&log"
 msgid "Digi&tal"
 msgstr "Sa&yısal"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Yazıtipi..."
 
@@ -14264,10 +14264,18 @@ msgid "C&olor:"
 msgstr "Re&nk:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Klasörler"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "Hedef d&izin:"
 
diff --git a/po/uk.po b/po/uk.po
index d72a91e85b2..db70c37c40b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Ім'я файлу:"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "&Огляд..."
 
@@ -10260,7 +10260,7 @@ msgstr "&Анало&говий"
 msgid "Digi&tal"
 msgstr "&Ци&фровий"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "&Шрифт..."
 
@@ -14296,10 +14296,18 @@ msgid "C&olor:"
 msgstr "Ко&лір:"
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "Теки"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "&Направити:"
 
diff --git a/po/wa.po b/po/wa.po
index 99b2dcf8ef6..cbe971ba1b8 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -2217,7 +2217,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "&Fitchî"
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -10027,7 +10027,7 @@ msgstr "&Analodjike"
 msgid "Digi&tal"
 msgstr "&Limerike"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 #, fuzzy
 msgid "&Font..."
 msgstr ""
@@ -13737,10 +13737,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/wine.pot b/po/wine.pot
index 2a03214fe86..284cb01bcc9 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -2165,7 +2165,7 @@ msgstr ""
 msgid "&File name:"
 msgstr ""
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr ""
 
@@ -9822,7 +9822,7 @@ msgstr ""
 msgid "Digi&tal"
 msgstr ""
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr ""
 
@@ -13463,10 +13463,18 @@ msgid "C&olor:"
 msgstr ""
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr ""
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 07171144de2..319f15b9774 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2203,7 +2203,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "文件名(&F)："
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "浏览(&R)..."
 
@@ -10000,7 +10000,7 @@ msgstr "模拟时钟(&L)"
 msgid "Digi&tal"
 msgstr "数字时钟(&T)"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "字体(&F)..."
 
@@ -13961,10 +13961,18 @@ msgid "C&olor:"
 msgstr "颜色(&O)："
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "文件夹"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "映射至(&L)："
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d71ef6ef8fe..226c1f7c155 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2213,7 +2213,7 @@ msgstr ""
 msgid "&File name:"
 msgstr "檔案名稱(&F)："
 
-#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309
+#: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:313
 msgid "B&rowse..."
 msgstr "瀏覽(&R)..."
 
@@ -10248,7 +10248,7 @@ msgstr "類比時鐘(&L)"
 msgid "Digi&tal"
 msgstr "數位時鐘(&T)"
 
-#: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84
+#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84
 msgid "&Font..."
 msgstr "字型(&F)..."
 
@@ -14522,10 +14522,18 @@ msgid "C&olor:"
 msgstr "顏色(&O)："
 
 #: winecfg.rc:304
+msgid "MIME types"
+msgstr ""
+
+#: winecfg.rc:305
+msgid "Manage file &associations"
+msgstr ""
+
+#: winecfg.rc:308
 msgid "Folders"
 msgstr "資料夾"
 
-#: winecfg.rc:307
+#: winecfg.rc:311
 msgid "&Link to:"
 msgstr "連結至(&L)："
 
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 0c0b038ff9d..2760e92c000 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -176,6 +176,7 @@
 #define IDC_SYSPARAM_COLOR_TEXT         1415
 #define IDC_SYSPARAM_COLOR              1416
 #define IDC_SYSPARAM_FONT               1417
+#define IDC_ENABLE_FILE_ASSOCIATIONS    1418
 
 #define IDC_SYSPARAMS_BUTTON            8400
 #define IDC_SYSPARAMS_BUTTON_TEXT       8401
diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c
index f98dcc3ae75..1934538f446 100644
--- a/programs/winecfg/theme.c
+++ b/programs/winecfg/theme.c
@@ -1168,6 +1168,26 @@ static void on_select_font(HWND hDlg)
         SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0);
 }
 
+static void init_mime_types(HWND hDlg)
+{
+    char *buf = get_reg_key(config_key, keypath("FileOpenAssociations"), "Enable", "Y");
+    int state = IS_OPTION_TRUE(*buf) ? BST_CHECKED : BST_UNCHECKED;
+
+    CheckDlgButton(hDlg, IDC_ENABLE_FILE_ASSOCIATIONS, state);
+
+    HeapFree(GetProcessHeap(), 0, buf);
+}
+
+static void update_mime_types(HWND hDlg)
+{
+    const char *state = "Y";
+
+    if (IsDlgButtonChecked(hDlg, IDC_ENABLE_FILE_ASSOCIATIONS) != BST_CHECKED)
+        state = "N";
+
+    set_reg_key(config_key, keypath("FileOpenAssociations"), "Enable", state);
+}
+
 INT_PTR CALLBACK
 ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -1177,8 +1197,9 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
             init_shell_folder_listview_headers(hDlg);
             update_shell_folder_listview(hDlg);
             read_sysparams(hDlg);
+            init_mime_types(hDlg);
             break;
-        
+
         case WM_DESTROY:
             free_theme_files();
             break;
@@ -1186,7 +1207,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
         case WM_SHOWWINDOW:
             set_window_title(hDlg);
             break;
-            
+
         case WM_COMMAND:
             switch(HIWORD(wParam)) {
                 case CBN_SELCHANGE: {
@@ -1296,6 +1317,10 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                             }
                             break;
                         }
+
+                        case IDC_ENABLE_FILE_ASSOCIATIONS:
+                            update_mime_types(hDlg);
+                            break;
                     }
                     break;
             }
@@ -1314,6 +1339,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     apply_sysparams();
                     read_shell_folder_link_targets();
                     update_shell_folder_listview(hDlg);
+                    update_mime_types(hDlg);
                     SetWindowLongPtrW(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
                     break;
                 }
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 5908b491d4b..33f54d43b2e 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -284,25 +284,29 @@ IDD_DESKTOP_INTEGRATION DIALOG  0, 0, 260, 220
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "Appearance",IDC_STATIC,8,4,244,106
-    LTEXT           "&Theme:",IDC_STATIC,15,16,130,8
-    COMBOBOX        IDC_THEME_THEMECOMBO,15,26,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&Install theme...",IDC_THEME_INSTALL,152,26,93,14
-    LTEXT           "&Color:",IDC_THEME_COLORTEXT,15,48,105,8
-    COMBOBOX        IDC_THEME_COLORCOMBO,15,58,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "&Size:",IDC_THEME_SIZETEXT,126,48,120,8
-    COMBOBOX        IDC_THEME_SIZECOMBO,126,58,120,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "It&em:",IDC_STATIC,15,80,105,8
-    COMBOBOX        IDC_SYSPARAM_COMBO,15,90,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,80,25,8,WS_DISABLED
-    PUSHBUTTON      "",IDC_SYSPARAM_COLOR,126,90,25,13,WS_DISABLED | BS_OWNERDRAW
-    LTEXT           "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,157,80,30,8,WS_DISABLED
-    EDITTEXT        IDC_SYSPARAM_SIZE,157,90,30,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED
-    CONTROL         "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,90,15,13
-    PUSHBUTTON      "&Font...",IDC_SYSPARAM_FONT,190,90,55,13,WS_DISABLED
-    GROUPBOX        "Folders",IDC_STATIC,8,114,244,100
+    GROUPBOX        "Appearance",IDC_STATIC,8,4,244,90
+    LTEXT           "&Theme:",IDC_STATIC,15,15,130,8
+    COMBOBOX        IDC_THEME_THEMECOMBO,15,25,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Install theme...",IDC_THEME_INSTALL,152,25,93,13
+    LTEXT           "&Color:",IDC_THEME_COLORTEXT,15,40,105,8
+    COMBOBOX        IDC_THEME_COLORCOMBO,15,50,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "&Size:",IDC_THEME_SIZETEXT,126,40,120,8
+    COMBOBOX        IDC_THEME_SIZECOMBO,126,50,120,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "It&em:",IDC_STATIC,15,65,105,8
+    COMBOBOX        IDC_SYSPARAM_COMBO,15,75,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT
+    LTEXT           "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,65,25,8,WS_DISABLED
+    PUSHBUTTON      "",IDC_SYSPARAM_COLOR,126,75,25,13,WS_DISABLED | BS_OWNERDRAW
+    LTEXT           "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,157,65,30,8,WS_DISABLED
+    EDITTEXT        IDC_SYSPARAM_SIZE,157,75,30,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED
+    CONTROL         "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,75,15,13
+
+    GROUPBOX        "MIME types",IDC_STATIC,8,95,244,23
+    CONTROL         "Manage file &associations",IDC_ENABLE_FILE_ASSOCIATIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,105,230,8
+
+    PUSHBUTTON      "&Font...",IDC_SYSPARAM_FONT,190,75,55,13,WS_DISABLED
+    GROUPBOX        "Folders",IDC_STATIC,8,120,244,94
     CONTROL         "",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT |
-                     LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64
+                     LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,132,230,58
     CONTROL         "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,65,13
     EDITTEXT         IDC_EDIT_SFPATH,80,195,110,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED
     PUSHBUTTON      "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index a81a5c76385..9adfed63079 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -104,6 +104,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder);
 #define in_startmenu(csidl)   ((csidl)==CSIDL_STARTMENU || \
                                (csidl)==CSIDL_COMMON_STARTMENU)
 
+#define IS_OPTION_TRUE(ch) \
+    ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')
+
 /* link file formats */
 
 #include "pshpack1.h"
@@ -3619,6 +3622,24 @@ static BOOL init_xdg(void)
     return FALSE;
 }
 
+static BOOL associations_enabled(void)
+{
+    BOOL ret = TRUE;
+    HKEY hkey;
+    BYTE buf[32];
+    DWORD len;
+
+    if ((hkey = open_associations_reg_key()))
+    {
+        len = sizeof(buf);
+        if (!RegQueryValueExA(hkey, "Enable", NULL, NULL, buf, &len))
+            ret = IS_OPTION_TRUE(buf[0]);
+        RegCloseKey( hkey );
+    }
+
+    return ret;
+}
+
 /***********************************************************************
  *
  *           wWinMain
@@ -3654,7 +3675,8 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh
 	    break;
         if( !strcmpW( token, dash_aW ) )
         {
-            RefreshFileTypeAssociations();
+            if (associations_enabled())
+                RefreshFileTypeAssociations();
             continue;
         }
         if( !strcmpW( token, dash_rW ) )