diff --git a/configure b/configure
index 70d02028b6950ea9bedb1d58e3bfbbc7d3219a4d..245662417f5b96af4b08fb7fba94da7bfbb36c46 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 ba36ddad74fd1ede751e4c9ffd5d656c95e6da30..2ae64f76ee7ad8188ec8b0fa23b75827fe68bd1a 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 d41fffb3e77f79d7bb006679376d19bb581f3177..9d781ae606c5cd47135c0bab449041cc9f3728ea 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 5fa0ba1714801157127e0a775f8691cd5eb72ce3..64e4ef203cb32365038315f3e5c6a7411180d1d8 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 3b3ca51e326c4bc9ccb3e82e91792509933a7854..af38917b617a969eddc847400164d9f3d79ef140 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 459229318d68d05c7782006ed4af8869c7b69923..58be3c4499b039bc6e841fd1a606d183840818ce 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 a5ba93d0e0ce37b9d9aa16de6f098a17b57863c8..699e13bdef4519981a282dad2f2399f1596114bb 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 73c83ca1d227666e764fa7e5d63a6e4b548624e7..f1625440ed0c3d41c8baf1f9b9045044f9eea975 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 da4aade51332bd857051a66fc6ed3462dd77f73f..8f4f16d5ad76b1c1d9d0b1fdceef6db8fbacd3b4 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 33a8b48d6ffadfea22cef2ac7978de2e9929c57e..b4982ae8aeb4280d7fc457b34fe3607718e40659 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 65b2cd9d6036620d7f5c680a14a64eb056a591a8..67d66da41642a4e5320d417bba18bae78101900f 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 1ff49c3c4563f345cceb67d429dd44b279fe5622..1e81b721b8a50cf0eab015529b7707ce159b7dc0 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 81002d804cd3cb6bbd542804e01a1eb834144d3c..29c37676eac888da4e6a27e484caf7b7dd27adab 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 be659cc39f58a68cad983d3b192c016b232528ac..e997dc9e02ddd7a9a2c7be79aad69af581562cb7 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 557fac06416b8bb4496d8c11a40ea441e2e9414f..a26e5ca528e8e989abba81bddb4ea3df0d13af24 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 12cd668eb7f61bb441c28295cbe572ce9fa0b18b..9060caada44f06aafc72ab94bdbfd3826d8f2dec 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 bbb7b65cf19de9d9112e7c8cbfb5443f5e175b2b..82e33e0368e7d2cb3aa3dbb4ac61501991c25184 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 75fa2cb9eb2ed9f619c6ea0c37b42c45b3f92445..cddfa02373575a4401f513e35823f5e3b09066e2 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 f82decf35d099ad8402be4bf40895ee1f063883b..2eab85010fd639d32e4d5f2d9bba8bf8e9543ab7 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 975c1cbdfe1e35f1d03ec42b1458e9218cee5978..854aeab0540e4bc58144bec595dce940247a405d 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 12b988f41c7dc395aa312746d6e5fb5842ac852f..aec022f70ca559a5aaffad55707186863a5a4194 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 92b4130b0bd332b581fa3d69f875518d47e1ca25..a406dfd72c20ee2978c54c64fa799d8ce687031b 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 a7fe3a1c09b62065b40532413d60f4e859e00746..a22c6dae32f97babd72a01248b9f3bf28d533d70 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 967e8fd77aa25b7ce06fed6f40f8c525a88e872b..78782a98ca05626c0c6ec39e1e8fc814a931b17c 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 f1433a40c3ef77e031a3f1b4dba6e27b3a86e3e4..4ad19d64289c5cfd1a0bf67cbd2dc86e349d1bb4 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 4e6ed1984425d75daea9e999eed9f46a080630ce..6eb8653699681a3588aece265eb527dea4d283a4 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 6eb2e2be8178b0e40bd50bbc3511089970d9818e..d0f2b136cbdeee618d3736beceac6ee34ab9dbb9 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 79cf605fb77a914349b3b6fdd370696d4a8bcfb7..afb980cc57d9c5b0f173059edddecd5caea08a83 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 6e00f9a16f0592dab547111cb1f169b414f30216..bebbda37793b763a872df79b986e22d8c3a0870e 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 39510cee4566702bb0f5f73b94ad5438ceba7808..9590761b86fe133803723c494723b7d2348ddeb5 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 946d5010ef3e38bd89bccfaac522da878725c008..94c802aeadf97485534b6376466816bbfe852818 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 22f4f311f11fdfef971c47c3a155e81249ae564e..2991cb64ec2453f09270eeb102dd5472d2c651b3 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 00d906d09704037e7ed880e8babf03ded4ba8260..e61cc8e765ccb57ed5107ac11f6f7faba2222b9a 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 d460f55c133735a701f865c1df0a19ccc9717e46..da8a1f0fa1ed617d14b6e299d87dface88ac4246 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 d391b00cd942d703efac676189879de4e78fef5d..dfc6afdf4e68d33f8ad88d5bfc90c97132879d39 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 a8e549964ad84f957df1d105e9078505682f5411..43a8d9bd326e85a32fa36a859c6053c9aeed061d 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 c9c8190065bcb1d1f4f24f76e9b77cb5b377796b..4f6dc71e2d4e0231420cfceb6a8f448eb70bf9c3 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 27e7b4d07c5d7e6c64babf4d44e7ac27d17212bd..4e4ee457d32446e623ae64b4c84b81d74109f992 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 f80fb8d8c44b84d1adccd801f77969ac42b0fc8c..f5957af66736750552a88577c891bf4b56e8bf05 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 22d38ffdcc87bb08e54a6d86a7e2de5da51deba5..9daa1d9319a875ff74f6b53bc493787c4dce891a 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 e9347400b71493ce312c8e19eb0aef939333e5c6..d26d74edd2c309cd84fee64b49bacf0f3286880e 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 311bf701ab997ae47b6ef4f44a08be40ca9a5cd2..dd77b540839b61af04e06688cab91b0dd56bc66f 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 15f8950c2b0189bb5eac87ba1354d6432a6461b2..617deb769a59f1cd1b84f3ed2ed274b5275127e5 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 1d8c86e16e6adc2927c84f72e5fedd4c27380a82..1b374bd0afeccf8d11d7d214b81644780a884dce 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 39fb95ccea12d0e8466345d44055339c1be32c02..70b41424eba7a595dece79dca84b01b0ab28aecc 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 3936121c3a72575db0acf663e62862ffd6673774..00840807a7a793c5dd351715e71d166b0cd97f20 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 ce40af4b32d84afb327bfbf201339d3601876600..aae1a08cffa40b215dde2044e106d7acf1b93701 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 608790af72f4dc187c1e53a2e2d1937ebcca0b9b..6a43982d497348681fa6ab03a826b930e22497a2 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 0000000000000000000000000000000000000000..5506494946ebca4b36d5ee63248bdc439da445e3
--- /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 48b4c4d30d614bc61e8fda59e5dab6e298073e31..6026a9d8a41486c003a9f98c16e5d415e62fdcad 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 6e4042c4e776ea48072bed6da5109261309047ca..5380548fbe85fd41da8fff330039ea14a74c91a4 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();