diff --git a/configure b/configure
index 70d02028b69..245662417f5 100755
--- a/configure
+++ b/configure
@@ -15470,7 +15470,7 @@ wine_fn_config_program cmd enable_cmd install,po
 wine_fn_config_test programs/cmd/tests cmd.exe_test
 wine_fn_config_program cmdlgtst enable_cmdlgtst
 wine_fn_config_program control enable_control install
-wine_fn_config_program dxdiag enable_dxdiag install
+wine_fn_config_program dxdiag enable_dxdiag install,po
 wine_fn_config_program eject enable_eject install
 wine_fn_config_program expand enable_expand install
 wine_fn_config_program explorer enable_explorer install
diff --git a/configure.ac b/configure.ac
index ba36ddad74f..2ae64f76ee7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2943,7 +2943,7 @@ WINE_CONFIG_PROGRAM(cmd,,[install,po])
 WINE_CONFIG_TEST(programs/cmd/tests)
 WINE_CONFIG_PROGRAM(cmdlgtst)
 WINE_CONFIG_PROGRAM(control,,[install])
-WINE_CONFIG_PROGRAM(dxdiag,,[install])
+WINE_CONFIG_PROGRAM(dxdiag,,[install,po])
 WINE_CONFIG_PROGRAM(eject,,[install])
 WINE_CONFIG_PROGRAM(expand,,[install])
 WINE_CONFIG_PROGRAM(explorer,,[install])
diff --git a/po/ar.po b/po/ar.po
index d41fffb3e77..9d781ae606c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8077,6 +8077,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 5fa0ba17148..64e4ef203cb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8252,6 +8252,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 3b3ca51e326..af38917b617 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8000,6 +8000,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 459229318d6..58be3c4499b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8631,6 +8631,14 @@ msgstr "More? "
 msgid "The input line is too long.\n"
 msgstr "The input line is too long.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index a5ba93d0e0c..699e13bdef4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8655,6 +8655,14 @@ msgstr "Mere? "
 msgid "The input line is too long.\n"
 msgstr "The input line is too long.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 73c83ca1d22..f1625440ed0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8644,6 +8644,14 @@ msgstr "Mehr? "
 msgid "The input line is too long.\n"
 msgstr "Die Eingabezeile ist zu lang.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index da4aade5133..8f4f16d5ad7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8124,6 +8124,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index 33a8b48d6ff..b4982ae8aeb 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8301,6 +8301,14 @@ msgstr "More? "
 msgid "The input line is too long.\n"
 msgstr "The input line is too long.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/en_US.po b/po/en_US.po
index 65b2cd9d603..67d66da4164 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -8393,6 +8393,14 @@ msgstr "More? "
 msgid "The input line is too long.\n"
 msgstr "The input line is too long.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr "DirectX Diagnostic Tool"
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr "Usage: hostname\n"
diff --git a/po/eo.po b/po/eo.po
index 1ff49c3c456..1e81b721b8a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8243,6 +8243,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 81002d804cd..29c37676eac 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8833,6 +8833,14 @@ msgstr "Más? "
 msgid "The input line is too long.\n"
 msgstr "La línea de entrada es demasiado larga.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index be659cc39f5..e997dc9e02d 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8079,6 +8079,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 557fac06416..a26e5ca528e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8324,6 +8324,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 12cd668eb7f..9060caada44 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8474,6 +8474,14 @@ msgstr "Plus ? "
 msgid "The input line is too long.\n"
 msgstr "La ligne d'entrée est trop longue.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr "Usage : hostname\n"
diff --git a/po/he.po b/po/he.po
index bbb7b65cf19..82e33e0368e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8493,6 +8493,14 @@ msgstr "More? "
 msgid "The input line is too long.\n"
 msgstr "The input line is too long.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 75fa2cb9eb2..cddfa023735 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7997,6 +7997,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index f82decf35d0..2eab85010fd 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8518,6 +8518,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 975c1cbdfe1..854aeab0540 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8738,6 +8738,14 @@ msgstr "Di più? "
 msgid "The input line is too long.\n"
 msgstr "La linea di input è troppo lunga.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 12b988f41c7..aec022f70ca 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8390,6 +8390,14 @@ msgstr "More? "
 msgid "The input line is too long.\n"
 msgstr "入力行が長すぎます。\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr "使い方: hostname\n"
diff --git a/po/ko.po b/po/ko.po
index 92b4130b0bd..a406dfd72c2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8362,6 +8362,14 @@ msgstr " 더? "
 msgid "The input line is too long.\n"
 msgstr "이 출력 줄은 너무 깁니다.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr "사용법:hostname\n"
diff --git a/po/lt.po b/po/lt.po
index a7fe3a1c09b..a22c6dae32f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8412,6 +8412,14 @@ msgstr "Daugiau? "
 msgid "The input line is too long.\n"
 msgstr "Įvedimo eilutė per ilga.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr "Naudojimas: hostname\n"
diff --git a/po/ml.po b/po/ml.po
index 967e8fd77aa..78782a98ca0 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7997,6 +7997,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index f1433a40c3e..4ad19d64289 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8660,6 +8660,14 @@ msgstr "More? "
 msgid "The input line is too long.\n"
 msgstr "The input line is too long.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 4e6ed198442..6eb86536996 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8546,6 +8546,14 @@ msgstr "Meer? "
 msgid "The input line is too long.\n"
 msgstr "De invoerregel is te lang.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/or.po b/po/or.po
index 6eb2e2be817..d0f2b136cbd 100644
--- a/po/or.po
+++ b/po/or.po
@@ -7997,6 +7997,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 79cf605fb77..afb980cc57d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7997,6 +7997,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 6e00f9a16f0..bebbda37793 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8410,6 +8410,14 @@ msgstr "Więcej? "
 msgid "The input line is too long.\n"
 msgstr "Wpisany tekst jest zbyt długi.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 39510cee456..9590761b86f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8685,6 +8685,14 @@ msgstr "Mais? "
 msgid "The input line is too long.\n"
 msgstr "A linha de entrada é muito longa.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 946d5010ef3..94c802aeadf 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8738,6 +8738,14 @@ msgstr "More? "
 msgid "The input line is too long.\n"
 msgstr "The input line is too long.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/rm.po b/po/rm.po
index 22f4f311f11..2991cb64ec2 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -8047,6 +8047,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 00d906d0970..e61cc8e765c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8971,6 +8971,14 @@ msgstr "Mai mult? "
 msgid "The input line is too long.\n"
 msgstr "Șirul introdus este prea lung.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index d460f55c133..da8a1f0fa1e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8407,6 +8407,14 @@ msgstr "Ещё? "
 msgid "The input line is too long.\n"
 msgstr "Введённая команда слишком длинная.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index d391b00cd94..dfc6afdf4e6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8279,6 +8279,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index a8e549964ad..43a8d9bd326 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8440,6 +8440,14 @@ msgstr "Več? "
 msgid "The input line is too long.\n"
 msgstr "Vrstica vhoda je predolga.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index c9c8190065b..4f6dc71e2d4 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -8385,6 +8385,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 27e7b4d07c5..4e4ee457d32 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -8439,6 +8439,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index f80fb8d8c44..f5957af6673 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8408,6 +8408,14 @@ msgstr "Mer? "
 msgid "The input line is too long.\n"
 msgstr "Inmatningen är för lång.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 22d38ffdcc8..9daa1d9319a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7997,6 +7997,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index e9347400b71..d26d74edd2c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8133,6 +8133,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 311bf701ab9..dd77b540839 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8779,6 +8779,14 @@ msgstr "More? "
 msgid "The input line is too long.\n"
 msgstr "The input line is too long.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 15f8950c2b0..617deb769a5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8417,6 +8417,14 @@ msgstr "Більше? "
 msgid "The input line is too long.\n"
 msgstr "Введений рядок задовгий.\n"
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 1d8c86e16e6..1b374bd0afe 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8095,6 +8095,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index 39fb95ccea1..70b41424eba 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -7973,6 +7973,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3936121c3a7..00840807a7a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8372,6 +8372,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ce40af4b32d..aae1a08cffa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8427,6 +8427,14 @@ msgstr ""
 msgid "The input line is too long.\n"
 msgstr ""
 
+#: dxdiag.rc:27
+msgid "DirectX Diagnostic Tool"
+msgstr ""
+
+#: dxdiag.rc:28
+msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+msgstr ""
+
 #: hostname.rc:27
 msgid "Usage: hostname\n"
 msgstr ""
diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in
index 608790af72f..6a43982d497 100644
--- a/programs/dxdiag/Makefile.in
+++ b/programs/dxdiag/Makefile.in
@@ -1,9 +1,13 @@
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 MODULE    = dxdiag.exe
 APPMODE   = -mwindows -municode
+IMPORTS   = user32
 
 C_SRCS = \
 	main.c \
 	output.c
 
+RC_SRCS = dxdiag.rc
+PO_SRCS = dxdiag.rc
+
 @MAKE_PROG_RULES@
diff --git a/programs/dxdiag/dxdiag.rc b/programs/dxdiag/dxdiag.rc
new file mode 100644
index 00000000000..5506494946e
--- /dev/null
+++ b/programs/dxdiag/dxdiag.rc
@@ -0,0 +1,29 @@
+/*
+ * Resources for the DirectX Diagnostic Tool
+ *
+ * Copyright 2011 Andrew Nguyen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "dxdiag_private.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_DXDIAG_TOOL, "DirectX Diagnostic Tool"
+    STRING_USAGE, "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
+}
diff --git a/programs/dxdiag/dxdiag_private.h b/programs/dxdiag/dxdiag_private.h
index 48b4c4d30d6..6026a9d8a41 100644
--- a/programs/dxdiag/dxdiag_private.h
+++ b/programs/dxdiag/dxdiag_private.h
@@ -18,6 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+
+/* Resource definitions. */
+#define MAX_STRING_LEN          1024
+
+#define STRING_DXDIAG_TOOL      101
+#define STRING_USAGE            102
+
 /* Output backend definitions. */
 enum output_type
 {
diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c
index 6e4042c4e77..5380548fbe8 100644
--- a/programs/dxdiag/main.c
+++ b/programs/dxdiag/main.c
@@ -27,6 +27,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
 
+HINSTANCE hInstance;
+
 struct command_line_info
 {
     WCHAR outfile[MAX_PATH];
@@ -36,7 +38,14 @@ struct command_line_info
 
 static void usage(void)
 {
-    WINE_FIXME("Usage message box is not implemented\n");
+    WCHAR title[MAX_STRING_LEN];
+    WCHAR usage[MAX_STRING_LEN];
+
+    LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, sizeof(title)/sizeof(WCHAR));
+    LoadStringW(hInstance, STRING_USAGE, usage, sizeof(usage)/sizeof(WCHAR));
+
+    MessageBoxW(NULL, usage, title, MB_OK | MB_ICONWARNING);
+
     ExitProcess(0);
 }
 
@@ -166,6 +175,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm
 {
     struct command_line_info info;
 
+    hInstance = hInst;
+
     if (!process_command_line(cmdline, &info))
         usage();