From f65c03a28c94c5f893f2837f9761c10e8aaa2fc1 Mon Sep 17 00:00:00 2001
From: "Carl J. Bialorucki" <cbialo2@outlook.com>
Date: Thu, 3 Aug 2023 16:50:39 -0600
Subject: [PATCH] [SOLITAIRE] Use the shell about dialog for solitaire and
 spider (#5493)

Use the shell about dialog for solitaire and spider solitaire.
This increases visual consistency throughout the operating system
and matches the behavior of the game from Windows XP.

- Use the shell about dialog instead of a plain MessageBox.
- Since the shell about dialog can only handle two lines of text,
  shorten the message dialog text to two lines.
---
 base/applications/games/solitaire/CMakeLists.txt | 2 +-
 base/applications/games/solitaire/lang/bg-BG.rc  | 2 +-
 base/applications/games/solitaire/lang/ca-ES.rc  | 2 +-
 base/applications/games/solitaire/lang/cs-CZ.rc  | 2 +-
 base/applications/games/solitaire/lang/de-DE.rc  | 2 +-
 base/applications/games/solitaire/lang/el-GR.rc  | 2 +-
 base/applications/games/solitaire/lang/en-US.rc  | 2 +-
 base/applications/games/solitaire/lang/es-ES.rc  | 2 +-
 base/applications/games/solitaire/lang/eu-ES.rc  | 2 +-
 base/applications/games/solitaire/lang/fr-FR.rc  | 2 +-
 base/applications/games/solitaire/lang/he-IL.rc  | 2 +-
 base/applications/games/solitaire/lang/hr-HR.rc  | 2 +-
 base/applications/games/solitaire/lang/hu-HU.rc  | 2 +-
 base/applications/games/solitaire/lang/id-ID.rc  | 2 +-
 base/applications/games/solitaire/lang/it-IT.rc  | 2 +-
 base/applications/games/solitaire/lang/ja-JP.rc  | 2 +-
 base/applications/games/solitaire/lang/ko-KR.rc  | 2 +-
 base/applications/games/solitaire/lang/lt-LT.rc  | 2 +-
 base/applications/games/solitaire/lang/nl-NL.rc  | 2 +-
 base/applications/games/solitaire/lang/no-NO.rc  | 2 +-
 base/applications/games/solitaire/lang/pl-PL.rc  | 2 +-
 base/applications/games/solitaire/lang/pt-BR.rc  | 2 +-
 base/applications/games/solitaire/lang/ro-RO.rc  | 2 +-
 base/applications/games/solitaire/lang/ru-RU.rc  | 2 +-
 base/applications/games/solitaire/lang/sk-SK.rc  | 2 +-
 base/applications/games/solitaire/lang/sq-AL.rc  | 2 +-
 base/applications/games/solitaire/lang/sv-SE.rc  | 2 +-
 base/applications/games/solitaire/lang/th-TH.rc  | 2 +-
 base/applications/games/solitaire/lang/tr-TR.rc  | 2 +-
 base/applications/games/solitaire/lang/uk-UA.rc  | 2 +-
 base/applications/games/solitaire/lang/zh-CN.rc  | 2 +-
 base/applications/games/solitaire/lang/zh-HK.rc  | 2 +-
 base/applications/games/solitaire/lang/zh-TW.rc  | 2 +-
 base/applications/games/solitaire/solitaire.cpp  | 4 +++-
 base/applications/games/spider/CMakeLists.txt    | 2 +-
 base/applications/games/spider/lang/bg-BG.rc     | 2 +-
 base/applications/games/spider/lang/cs-CZ.rc     | 2 +-
 base/applications/games/spider/lang/de-DE.rc     | 2 +-
 base/applications/games/spider/lang/en-US.rc     | 2 +-
 base/applications/games/spider/lang/es-ES.rc     | 2 +-
 base/applications/games/spider/lang/fr-FR.rc     | 2 +-
 base/applications/games/spider/lang/he-IL.rc     | 2 +-
 base/applications/games/spider/lang/hr-HR.rc     | 2 +-
 base/applications/games/spider/lang/hu-HU.rc     | 2 +-
 base/applications/games/spider/lang/it-IT.rc     | 2 +-
 base/applications/games/spider/lang/ja-JP.rc     | 2 +-
 base/applications/games/spider/lang/nl-NL.rc     | 2 +-
 base/applications/games/spider/lang/pl-PL.rc     | 2 +-
 base/applications/games/spider/lang/pt-BR.rc     | 2 +-
 base/applications/games/spider/lang/ro-RO.rc     | 2 +-
 base/applications/games/spider/lang/ru-RU.rc     | 2 +-
 base/applications/games/spider/lang/sk-SK.rc     | 2 +-
 base/applications/games/spider/lang/sq-AL.rc     | 2 +-
 base/applications/games/spider/lang/sv-SE.rc     | 2 +-
 base/applications/games/spider/lang/tr-TR.rc     | 2 +-
 base/applications/games/spider/lang/uk-UA.rc     | 2 +-
 base/applications/games/spider/lang/zh-CN.rc     | 2 +-
 base/applications/games/spider/spider.cpp        | 4 +++-
 58 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt
index a229418320a..8f5ec1b023d 100644
--- a/base/applications/games/solitaire/CMakeLists.txt
+++ b/base/applications/games/solitaire/CMakeLists.txt
@@ -10,6 +10,6 @@ add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/solitaire.ico)
 add_executable(sol ${SOURCE} rsrc.rc)
 target_link_libraries(sol cardlib)
 set_module_type(sol win32gui UNICODE)
-add_importlibs(sol advapi32 comctl32 user32 gdi32 msvcrt kernel32)
+add_importlibs(sol advapi32 comctl32 shell32 user32 gdi32 msvcrt kernel32)
 add_pch(sol solitaire.h SOURCE)
 add_cd_file(TARGET sol DESTINATION reactos/system32 FOR all)
diff --git a/base/applications/games/solitaire/lang/bg-BG.rc b/base/applications/games/solitaire/lang/bg-BG.rc
index 2b8a79bf8b5..741f1ffcd7e 100644
--- a/base/applications/games/solitaire/lang/bg-BG.rc
+++ b/base/applications/games/solitaire/lang/bg-BG.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Пасианс"
-    IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Да прекратя ли играта?"
     IDS_SOL_WIN "Поздравления, победихте!!"
     IDS_SOL_DEAL "Ново раздаване?"
diff --git a/base/applications/games/solitaire/lang/ca-ES.rc b/base/applications/games/solitaire/lang/ca-ES.rc
index 231eb5589b3..5fa358761c2 100644
--- a/base/applications/games/solitaire/lang/ca-ES.rc
+++ b/base/applications/games/solitaire/lang/ca-ES.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitari"
-    IDS_SOL_ABOUT "Solitari per J Brown\n\nCardLib versio 1.0."
+    IDS_SOL_ABOUT "Solitari per J Brown\nCardLib versio 1.0"
     IDS_SOL_QUIT "Voleu sortir del joc actual?"
     IDS_SOL_WIN "Felicitats, heu guanyat!!"
     IDS_SOL_DEAL "Deal again?"
diff --git a/base/applications/games/solitaire/lang/cs-CZ.rc b/base/applications/games/solitaire/lang/cs-CZ.rc
index bb61acd6295..3acd94595fa 100644
--- a/base/applications/games/solitaire/lang/cs-CZ.rc
+++ b/base/applications/games/solitaire/lang/cs-CZ.rc
@@ -53,7 +53,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib verze 1.0."
+    IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib verze 1.0"
     IDS_SOL_QUIT "Ukončit rozehranou hru?"
     IDS_SOL_WIN "Gratulujeme, zvítězili jste!!"
     IDS_SOL_DEAL "Rozdat znova?"
diff --git a/base/applications/games/solitaire/lang/de-DE.rc b/base/applications/games/solitaire/lang/de-DE.rc
index 3211c65648b..b8ab16c2c4d 100644
--- a/base/applications/games/solitaire/lang/de-DE.rc
+++ b/base/applications/games/solitaire/lang/de-DE.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitär"
-    IDS_SOL_ABOUT "Solitär von J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitär von J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Laufendes Spiel beenden?"
     IDS_SOL_WIN "Glückwunsch, Sie haben gewonnen!"
     IDS_SOL_DEAL "Neu geben?"
diff --git a/base/applications/games/solitaire/lang/el-GR.rc b/base/applications/games/solitaire/lang/el-GR.rc
index 08707ffce52..30954f2f1fd 100644
--- a/base/applications/games/solitaire/lang/el-GR.rc
+++ b/base/applications/games/solitaire/lang/el-GR.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Πασιέντζα"
-    IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Τερματισμός του πιαχνιδιού αυτού;"
     IDS_SOL_WIN "Συγχαρητήρια, κερδίσατε!!"
     IDS_SOL_DEAL "Deal again?"
diff --git a/base/applications/games/solitaire/lang/en-US.rc b/base/applications/games/solitaire/lang/en-US.rc
index b8111ee7e2b..427fafa61ee 100644
--- a/base/applications/games/solitaire/lang/en-US.rc
+++ b/base/applications/games/solitaire/lang/en-US.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Quit the current game?"
     IDS_SOL_WIN "Congratulations, you win!"
     IDS_SOL_DEAL "Deal again?"
diff --git a/base/applications/games/solitaire/lang/es-ES.rc b/base/applications/games/solitaire/lang/es-ES.rc
index 16d1944faa8..bc39ffb7d3e 100644
--- a/base/applications/games/solitaire/lang/es-ES.rc
+++ b/base/applications/games/solitaire/lang/es-ES.rc
@@ -57,7 +57,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME  "Solitario"
-    IDS_SOL_ABOUT "Solitario por J Brown\n\nCardLib versión 1.0."
+    IDS_SOL_ABOUT "Solitario por J Brown\nCardLib versión 1.0"
     IDS_SOL_QUIT  "¿Salir del juego actual?"
     IDS_SOL_WIN   "¡Enhorabuena, has ganado!"
     IDS_SOL_DEAL  "¿Jugar de nuevo?"
diff --git a/base/applications/games/solitaire/lang/eu-ES.rc b/base/applications/games/solitaire/lang/eu-ES.rc
index 064f283d75e..f8af4d832df 100644
--- a/base/applications/games/solitaire/lang/eu-ES.rc
+++ b/base/applications/games/solitaire/lang/eu-ES.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitarioa"
-    IDS_SOL_ABOUT "Solitarioa J Brown\n\nCardLib-k egina  1.0. bertsioa"
+    IDS_SOL_ABOUT "Solitarioa J Brown\nCardLib-k egina 1.0 bertsioa"
     IDS_SOL_QUIT "Uneko jokoa amaitu?"
     IDS_SOL_WIN "Zorionak, irabazi duzu!!"
     IDS_SOL_DEAL "Deal again?"
diff --git a/base/applications/games/solitaire/lang/fr-FR.rc b/base/applications/games/solitaire/lang/fr-FR.rc
index 2f81611d373..662b4abd1c4 100644
--- a/base/applications/games/solitaire/lang/fr-FR.rc
+++ b/base/applications/games/solitaire/lang/fr-FR.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire par J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire par J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Quitter le jeu actuel ?"
     IDS_SOL_WIN "Félicitations ! Vous avez gagné !"
     IDS_SOL_DEAL "Redistribuer ?"
diff --git a/base/applications/games/solitaire/lang/he-IL.rc b/base/applications/games/solitaire/lang/he-IL.rc
index dda42542783..358d69848c3 100644
--- a/base/applications/games/solitaire/lang/he-IL.rc
+++ b/base/applications/games/solitaire/lang/he-IL.rc
@@ -57,7 +57,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "סוליטייר"
-    IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "להפסיק את המשחק הנוכחי?"
     IDS_SOL_WIN "כל הכבוד, ניצחת!"
     IDS_SOL_DEAL "לחלק שוב?"
diff --git a/base/applications/games/solitaire/lang/hr-HR.rc b/base/applications/games/solitaire/lang/hr-HR.rc
index 0f38cca40d2..46ad0a1777f 100644
--- a/base/applications/games/solitaire/lang/hr-HR.rc
+++ b/base/applications/games/solitaire/lang/hr-HR.rc
@@ -54,7 +54,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire od J Brown\n\nCardLib verzija 1.0."
+    IDS_SOL_ABOUT "Solitaire od J Brown\nCardLib verzija 1.0"
     IDS_SOL_QUIT "Napusti trenutnu igru?"
     IDS_SOL_WIN "Čestitke, pobijedili ste!"
     IDS_SOL_DEAL "Ponovi?"
diff --git a/base/applications/games/solitaire/lang/hu-HU.rc b/base/applications/games/solitaire/lang/hu-HU.rc
index 981be2f1663..408125354f1 100644
--- a/base/applications/games/solitaire/lang/hu-HU.rc
+++ b/base/applications/games/solitaire/lang/hu-HU.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Pasziánsz"
-    IDS_SOL_ABOUT "Pasziánsz, készítette J Brown\n\nCardLib verzió 1.0."
+    IDS_SOL_ABOUT "Pasziánsz, készítette J Brown\nCardLib verzió 1.0"
     IDS_SOL_QUIT "Kilépés ebből a játékból?"
     IDS_SOL_WIN "Gratulálok, Ön nyert!"
     IDS_SOL_DEAL "Új leosztás?"
diff --git a/base/applications/games/solitaire/lang/id-ID.rc b/base/applications/games/solitaire/lang/id-ID.rc
index b877e5ae7a1..63bf4f8c149 100644
--- a/base/applications/games/solitaire/lang/id-ID.rc
+++ b/base/applications/games/solitaire/lang/id-ID.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire oleh J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire oleh J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Keluar dari permainan saat ini?"
     IDS_SOL_WIN "Selamat, anda menang!"
     IDS_SOL_DEAL "Main lagi?"
diff --git a/base/applications/games/solitaire/lang/it-IT.rc b/base/applications/games/solitaire/lang/it-IT.rc
index 845f574e154..7305216bba1 100644
--- a/base/applications/games/solitaire/lang/it-IT.rc
+++ b/base/applications/games/solitaire/lang/it-IT.rc
@@ -56,7 +56,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitario"
-    IDS_SOL_ABOUT "Solitario by J Brown\n\nCardLib versione 1.0."
+    IDS_SOL_ABOUT "Solitario by J Brown\nCardLib versione 1.0"
     IDS_SOL_QUIT "Chiudere la partita in corso?"
     IDS_SOL_WIN "Congratulazioni, hai vinto!!"
     IDS_SOL_DEAL "Nuova partita?"
diff --git a/base/applications/games/solitaire/lang/ja-JP.rc b/base/applications/games/solitaire/lang/ja-JP.rc
index fc8bd2fa945..849a114c488 100644
--- a/base/applications/games/solitaire/lang/ja-JP.rc
+++ b/base/applications/games/solitaire/lang/ja-JP.rc
@@ -54,7 +54,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "ソリティア"
-    IDS_SOL_ABOUT "J Brown によるソリティア\n\nCardLib バージョン 1.0。"
+    IDS_SOL_ABOUT "J Brown によるソリティア\nCardLib バージョン 1.0"
     IDS_SOL_QUIT "現在のゲームを終了しますか?"
     IDS_SOL_WIN "おめでとう、あなたの勝ちです!"
     IDS_SOL_DEAL "もう一度カードを配りますか?"
diff --git a/base/applications/games/solitaire/lang/ko-KR.rc b/base/applications/games/solitaire/lang/ko-KR.rc
index 5c16be49a6b..11be942c581 100644
--- a/base/applications/games/solitaire/lang/ko-KR.rc
+++ b/base/applications/games/solitaire/lang/ko-KR.rc
@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "카드놀이"
-    IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "현재 게임을 끝낼가요?"
     IDS_SOL_WIN "축하합니다!!"
     IDS_SOL_DEAL "Deal again?"
diff --git a/base/applications/games/solitaire/lang/lt-LT.rc b/base/applications/games/solitaire/lang/lt-LT.rc
index dbb674c3857..04c6f508cb8 100644
--- a/base/applications/games/solitaire/lang/lt-LT.rc
+++ b/base/applications/games/solitaire/lang/lt-LT.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire\n\nSukurta J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire sukurta J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Baigti žaidimą?"
     IDS_SOL_WIN "Sveikiname, jūs laimėjote!!"
     IDS_SOL_DEAL "Dalinti vėl?"
diff --git a/base/applications/games/solitaire/lang/nl-NL.rc b/base/applications/games/solitaire/lang/nl-NL.rc
index 6e71cd9fc59..a1247a2bf40 100644
--- a/base/applications/games/solitaire/lang/nl-NL.rc
+++ b/base/applications/games/solitaire/lang/nl-NL.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire door J Brown\n\nCardLib versie 1.0."
+    IDS_SOL_ABOUT "Solitaire door J Brown\nCardLib versie 1.0"
     IDS_SOL_QUIT "Het huidige spel afsluiten?"
     IDS_SOL_WIN "Gefeliciteerd, u heeft gewonnen!"
     IDS_SOL_DEAL "Nogmaals spelen?"
diff --git a/base/applications/games/solitaire/lang/no-NO.rc b/base/applications/games/solitaire/lang/no-NO.rc
index 79600a528cb..a4c8ccab983 100644
--- a/base/applications/games/solitaire/lang/no-NO.rc
+++ b/base/applications/games/solitaire/lang/no-NO.rc
@@ -47,7 +47,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Kabal"
-    IDS_SOL_ABOUT "Kabal av J Brown\n\nCardLib versjon 1.0."
+    IDS_SOL_ABOUT "Kabal av J Brown\nCardLib versjon 1.0"
     IDS_SOL_QUIT "Slutt nåværende spill?"
     IDS_SOL_WIN "Gratulerer, du vant!!"
     IDS_SOL_DEAL "Del ut igjen?"
diff --git a/base/applications/games/solitaire/lang/pl-PL.rc b/base/applications/games/solitaire/lang/pl-PL.rc
index 1cc70b5f4df..78c57462e2d 100644
--- a/base/applications/games/solitaire/lang/pl-PL.rc
+++ b/base/applications/games/solitaire/lang/pl-PL.rc
@@ -58,7 +58,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Pasjans"
-    IDS_SOL_ABOUT "Pasjans - autor: J. Brown\n\nCardLib wersja 1.0."
+    IDS_SOL_ABOUT "Pasjans - autor: J. Brown\nCardLib wersja 1.0"
     IDS_SOL_QUIT "Zakończyć aktualną grę?"
     IDS_SOL_WIN "Gratulacje, wygrałeś!"
     IDS_SOL_DEAL "Nowe rozdanie?"
diff --git a/base/applications/games/solitaire/lang/pt-BR.rc b/base/applications/games/solitaire/lang/pt-BR.rc
index 6f8563bc8a2..96150204679 100644
--- a/base/applications/games/solitaire/lang/pt-BR.rc
+++ b/base/applications/games/solitaire/lang/pt-BR.rc
@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Paciência"
-    IDS_SOL_ABOUT "Paciência por J Brown\n\nCardLib versão 1.0."
+    IDS_SOL_ABOUT "Paciência por J Brown\nCardLib versão 1.0"
     IDS_SOL_QUIT "Sair do jogo Atual?"
     IDS_SOL_WIN "Parabéns, Você ganhou!"
     IDS_SOL_DEAL "Jogar de Novo?"
diff --git a/base/applications/games/solitaire/lang/ro-RO.rc b/base/applications/games/solitaire/lang/ro-RO.rc
index bbcc5461f69..a5740a88549 100644
--- a/base/applications/games/solitaire/lang/ro-RO.rc
+++ b/base/applications/games/solitaire/lang/ro-RO.rc
@@ -56,7 +56,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Pasiență"
-    IDS_SOL_ABOUT "Pasiență de J Brown\nTradus de Petru Dimitriu\nCardLib versiunea 1.0."
+    IDS_SOL_ABOUT "Pasiență de J Brown; Tradus de Petru Dimitriu\nCardLib versiunea 1.0"
     IDS_SOL_QUIT "Abandonați jocul curent?"
     IDS_SOL_WIN "Felicitări, ați câștigat!"
     IDS_SOL_DEAL "O nouă rundă?"
diff --git a/base/applications/games/solitaire/lang/ru-RU.rc b/base/applications/games/solitaire/lang/ru-RU.rc
index 047ce7487f8..eff52d849cb 100644
--- a/base/applications/games/solitaire/lang/ru-RU.rc
+++ b/base/applications/games/solitaire/lang/ru-RU.rc
@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Пасьянс"
-    IDS_SOL_ABOUT "Пасьянс от J Brown\n\nCardLib версии 1.0."
+    IDS_SOL_ABOUT "Пасьянс от J Brown\nCardLib версии 1.0"
     IDS_SOL_QUIT "Закончить текущую игру?"
     IDS_SOL_WIN "Поздравляем, вы выиграли!"
     IDS_SOL_DEAL "Раздать ещё раз?"
diff --git a/base/applications/games/solitaire/lang/sk-SK.rc b/base/applications/games/solitaire/lang/sk-SK.rc
index 11a33849c43..0f69fe91379 100644
--- a/base/applications/games/solitaire/lang/sk-SK.rc
+++ b/base/applications/games/solitaire/lang/sk-SK.rc
@@ -56,7 +56,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitér"
-    IDS_SOL_ABOUT "Solitér od J Brown\n\nCardLib verzia 1.0"
+    IDS_SOL_ABOUT "Solitér od J Brown\nCardLib verzia 1.0"
     IDS_SOL_QUIT "Naozaj chcete skončiť aktuálnu hru?"
     IDS_SOL_WIN "Blahoželám, vyhrali ste!"
     IDS_SOL_DEAL "Rozdať znova?"
diff --git a/base/applications/games/solitaire/lang/sq-AL.rc b/base/applications/games/solitaire/lang/sq-AL.rc
index 02400e87f51..4f0fb679cf6 100644
--- a/base/applications/games/solitaire/lang/sq-AL.rc
+++ b/base/applications/games/solitaire/lang/sq-AL.rc
@@ -56,7 +56,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire nga J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire nga J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Largohu Nga Loja?"
     IDS_SOL_WIN "Urime, keni fituar!"
     IDS_SOL_DEAL "Fillo Perseri?"
diff --git a/base/applications/games/solitaire/lang/sv-SE.rc b/base/applications/games/solitaire/lang/sv-SE.rc
index d548ee8670f..bc073589eab 100644
--- a/base/applications/games/solitaire/lang/sv-SE.rc
+++ b/base/applications/games/solitaire/lang/sv-SE.rc
@@ -47,7 +47,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire av J Brown\nÖversätt av Ronny K Svensson\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire av J Brown; Översätt av Ronny K Svensson\nCardLib version 1.0"
     IDS_SOL_QUIT "Avsluta nuvarande spel?"
     IDS_SOL_WIN "Grattis, du vann!"
     IDS_SOL_DEAL "Ge igen?"
diff --git a/base/applications/games/solitaire/lang/th-TH.rc b/base/applications/games/solitaire/lang/th-TH.rc
index c5e8486224e..12862c680be 100644
--- a/base/applications/games/solitaire/lang/th-TH.rc
+++ b/base/applications/games/solitaire/lang/th-TH.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib version 1.0"
     IDS_SOL_QUIT "Quit the current game?"
     IDS_SOL_WIN "Congratulations, you win!"
     IDS_SOL_DEAL "Deal again?"
diff --git a/base/applications/games/solitaire/lang/tr-TR.rc b/base/applications/games/solitaire/lang/tr-TR.rc
index 67438265ec5..360fb9a05e6 100644
--- a/base/applications/games/solitaire/lang/tr-TR.rc
+++ b/base/applications/games/solitaire/lang/tr-TR.rc
@@ -56,7 +56,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Solitaire"
-    IDS_SOL_ABOUT "Solitaire, J Brown tarafından yazılmıştır.\n\nCardLib sürümü: 1.0"
+    IDS_SOL_ABOUT "Solitaire, J Brown tarafından yazılmıştır.\nCardLib sürümü: 1.0"
     IDS_SOL_QUIT "Şimdiki oyundan çıkılsın mı?"
     IDS_SOL_WIN "Tebrikler, kazandınız!"
     IDS_SOL_DEAL "Yeniden dağıtılsın mı?"
diff --git a/base/applications/games/solitaire/lang/uk-UA.rc b/base/applications/games/solitaire/lang/uk-UA.rc
index c65482340e7..c816ba697d2 100644
--- a/base/applications/games/solitaire/lang/uk-UA.rc
+++ b/base/applications/games/solitaire/lang/uk-UA.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Косинка"
-    IDS_SOL_ABOUT "Косинка від J Brown\n\nCardLib версії 1.0."
+    IDS_SOL_ABOUT "Косинка від J Brown\nCardLib версії 1.0"
     IDS_SOL_QUIT "Вийти з поточної гри?"
     IDS_SOL_WIN "Вітання, Ви виграли!!"
     IDS_SOL_DEAL "Роздати знову?"
diff --git a/base/applications/games/solitaire/lang/zh-CN.rc b/base/applications/games/solitaire/lang/zh-CN.rc
index b71141ea0a9..0eed7b48a5e 100644
--- a/base/applications/games/solitaire/lang/zh-CN.rc
+++ b/base/applications/games/solitaire/lang/zh-CN.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "纸牌"
-    IDS_SOL_ABOUT "纸牌由 J Brown 开发\n\nCardLib 版本 1.0。"
+    IDS_SOL_ABOUT "纸牌由 J Brown 开发\nCardLib 版本 1.0"
     IDS_SOL_QUIT "退出当前游戏？"
     IDS_SOL_WIN "恭喜你，你赢了！"
     IDS_SOL_DEAL "再玩一次？"
diff --git a/base/applications/games/solitaire/lang/zh-HK.rc b/base/applications/games/solitaire/lang/zh-HK.rc
index 4668e43474b..12ca3c905c3 100644
--- a/base/applications/games/solitaire/lang/zh-HK.rc
+++ b/base/applications/games/solitaire/lang/zh-HK.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "接龍"
-    IDS_SOL_ABOUT "接龍由 J Brown 開發\n\nCardLib 版本 1.0。"
+    IDS_SOL_ABOUT "接龍由 J Brown 開發\nCardLib 版本 1.0"
     IDS_SOL_QUIT "退出目前遊戲？"
     IDS_SOL_WIN "恭喜您，您贏咗！！"
     IDS_SOL_DEAL "再玩一次？"
diff --git a/base/applications/games/solitaire/lang/zh-TW.rc b/base/applications/games/solitaire/lang/zh-TW.rc
index 99e1ff427d1..31d90cf0966 100644
--- a/base/applications/games/solitaire/lang/zh-TW.rc
+++ b/base/applications/games/solitaire/lang/zh-TW.rc
@@ -55,7 +55,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "接龍"
-    IDS_SOL_ABOUT "接龍由 J Brown 開發\n\nCardLib 版本 1.0"
+    IDS_SOL_ABOUT "接龍由 J Brown 開發\nCardLib 版本 1.0"
     IDS_SOL_QUIT "退出目前遊戲？"
     IDS_SOL_WIN "恭喜您，您贏了！！"
     IDS_SOL_DEAL "再玩一次？"
diff --git a/base/applications/games/solitaire/solitaire.cpp b/base/applications/games/solitaire/solitaire.cpp
index 3fd6a256cd3..187c0ead851 100644
--- a/base/applications/games/solitaire/solitaire.cpp
+++ b/base/applications/games/solitaire/solitaire.cpp
@@ -2,6 +2,7 @@
 
 #include <winreg.h>
 #include <commctrl.h>
+#include <shellapi.h>
 #include <tchar.h>
 
 #include "resource.h"
@@ -738,7 +739,8 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
                 return 0;
 
             case IDM_HELP_ABOUT:
-                MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION);
+                ShellAbout(hwnd, szAppName, MsgAbout,
+                           LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SOLITAIRE)));
                 return 0;
 
             case IDM_GAME_EXIT:
diff --git a/base/applications/games/spider/CMakeLists.txt b/base/applications/games/spider/CMakeLists.txt
index 78d4f64d7aa..ddf29582e19 100644
--- a/base/applications/games/spider/CMakeLists.txt
+++ b/base/applications/games/spider/CMakeLists.txt
@@ -10,5 +10,5 @@ target_link_libraries(spider cardlib)
 target_include_directories(spider PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 add_pch(spider spider.h SOURCE)
 set_module_type(spider win32gui UNICODE)
-add_importlibs(spider advapi32 comctl32 user32 gdi32 msvcrt kernel32)
+add_importlibs(spider advapi32 comctl32 shell32 user32 gdi32 msvcrt kernel32)
 add_cd_file(TARGET spider DESTINATION reactos/system32 FOR all)
diff --git a/base/applications/games/spider/lang/bg-BG.rc b/base/applications/games/spider/lang/bg-BG.rc
index 9cae6648e27..69c3db7551b 100644
--- a/base/applications/games/spider/lang/bg-BG.rc
+++ b/base/applications/games/spider/lang/bg-BG.rc
@@ -40,7 +40,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Паяк"
-    IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\nCardLib version 1.0"
     IDS_SPI_QUIT "Изход от текушата игра?"
     IDS_SPI_WIN "Поздравления, спечелихте!"
     IDS_SPI_DEAL "Ново раздаване?"
diff --git a/base/applications/games/spider/lang/cs-CZ.rc b/base/applications/games/spider/lang/cs-CZ.rc
index 0f429589973..947c4984209 100644
--- a/base/applications/games/spider/lang/cs-CZ.rc
+++ b/base/applications/games/spider/lang/cs-CZ.rc
@@ -40,7 +40,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Spider Solitaire vytvořil Gregor Schneider\n\nCardLib verze 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire vytvořil Gregor Schneider\nCardLib verze 1.0"
     IDS_SPI_QUIT "Ukončit hru?"
     IDS_SPI_WIN "Gratulace k výhře!"
     IDS_SPI_DEAL "Rozdat znovu?"
diff --git a/base/applications/games/spider/lang/de-DE.rc b/base/applications/games/spider/lang/de-DE.rc
index 71a04c48d7b..d1c27231916 100644
--- a/base/applications/games/spider/lang/de-DE.rc
+++ b/base/applications/games/spider/lang/de-DE.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Spider Solitaire von Gregor Schneider\n\nCardLib Version 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire von Gregor Schneider\nCardLib Version 1.0"
     IDS_SPI_QUIT "Laufendes Spiel beenden?"
     IDS_SPI_WIN "Glückwunsch, Sie haben gewonnen!"
     IDS_SPI_DEAL "Neu geben?"
diff --git a/base/applications/games/spider/lang/en-US.rc b/base/applications/games/spider/lang/en-US.rc
index fd179384a60..50d2fee0afb 100644
--- a/base/applications/games/spider/lang/en-US.rc
+++ b/base/applications/games/spider/lang/en-US.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\nCardLib version 1.0"
     IDS_SPI_QUIT "Quit the current game?"
     IDS_SPI_WIN "Congratulations, you win!"
     IDS_SPI_DEAL "Deal again?"
diff --git a/base/applications/games/spider/lang/es-ES.rc b/base/applications/games/spider/lang/es-ES.rc
index 3d16fc8ae28..522387d1a5e 100644
--- a/base/applications/games/spider/lang/es-ES.rc
+++ b/base/applications/games/spider/lang/es-ES.rc
@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Solitario Spider por Gregor Schneider\n\nCardLib versión 1.0"
+    IDS_SPI_ABOUT "Solitario Spider por Gregor Schneider\nCardLib versión 1.0"
     IDS_SPI_QUIT "¿Salir del juego actual?"
     IDS_SPI_WIN "¡Enhorabuena, has ganado!"
     IDS_SPI_DEAL "¿Jugar de nuevo?"
diff --git a/base/applications/games/spider/lang/fr-FR.rc b/base/applications/games/spider/lang/fr-FR.rc
index 330d6b9189d..03aee3d1963 100644
--- a/base/applications/games/spider/lang/fr-FR.rc
+++ b/base/applications/games/spider/lang/fr-FR.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Spider Solitaire par Gregor Schneider\n\nCardLib version 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire par Gregor Schneider\nCardLib version 1.0"
     IDS_SPI_QUIT "Quitter le jeu actuel ?"
     IDS_SPI_WIN "Félicitations, Vous avez gagné !"
     IDS_SPI_DEAL "Redistribuer ?"
diff --git a/base/applications/games/spider/lang/he-IL.rc b/base/applications/games/spider/lang/he-IL.rc
index 9941b9980e0..e0789a6c08f 100644
--- a/base/applications/games/spider/lang/he-IL.rc
+++ b/base/applications/games/spider/lang/he-IL.rc
@@ -50,7 +50,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "עכביש"
-    IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\nCardLib version 1.0"
     IDS_SPI_QUIT "להפסיק את המשחק הנוכחי?"
     IDS_SPI_WIN "כל הכבוד, ניצחת!"
     IDS_SPI_DEAL "לחלק שוב?"
diff --git a/base/applications/games/spider/lang/hr-HR.rc b/base/applications/games/spider/lang/hr-HR.rc
index 1812d575de4..33a5c5df9fe 100644
--- a/base/applications/games/spider/lang/hr-HR.rc
+++ b/base/applications/games/spider/lang/hr-HR.rc
@@ -47,7 +47,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Spider Solitaire od Gregor Schneider\n\nCardLib verzija 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire od Gregor Schneider\nCardLib verzija 1.0"
     IDS_SPI_QUIT "Napusti trenutnu igru?"
     IDS_SPI_WIN "Čestitke, pobijedili ste!"
     IDS_SPI_DEAL "Ponovno?"
diff --git a/base/applications/games/spider/lang/hu-HU.rc b/base/applications/games/spider/lang/hu-HU.rc
index c1c1feb5586..e99dd10551b 100644
--- a/base/applications/games/spider/lang/hu-HU.rc
+++ b/base/applications/games/spider/lang/hu-HU.rc
@@ -40,7 +40,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Fekete özvegy"
-    IDS_SPI_ABOUT "Fekete Özvegy, készítette Gregor Schneider\n\nCardLib verzió 1.0"
+    IDS_SPI_ABOUT "Fekete Özvegy, készítette Gregor Schneider\nCardLib verzió 1.0"
     IDS_SPI_QUIT "Kilépés ebből a játékból?"
     IDS_SPI_WIN "Gratulálok, Ön nyert!"
     IDS_SPI_DEAL "Új leosztás?"
diff --git a/base/applications/games/spider/lang/it-IT.rc b/base/applications/games/spider/lang/it-IT.rc
index 9e1be1d81ca..8fc4af47729 100644
--- a/base/applications/games/spider/lang/it-IT.rc
+++ b/base/applications/games/spider/lang/it-IT.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Solitario Spider di Gregor Schneider\n\nCardLib version 1.0"
+    IDS_SPI_ABOUT "Solitario Spider di Gregor Schneider\nCardLib version 1.0"
     IDS_SPI_QUIT "Chiudere la partita?"
     IDS_SPI_WIN "Complimenti, hai vinto!"
     IDS_SPI_DEAL "Nuova partita?"
diff --git a/base/applications/games/spider/lang/ja-JP.rc b/base/applications/games/spider/lang/ja-JP.rc
index 889d5134c78..0f6ad4e42ba 100644
--- a/base/applications/games/spider/lang/ja-JP.rc
+++ b/base/applications/games/spider/lang/ja-JP.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "スパイダ"
-    IDS_SPI_ABOUT "Gregor Schneider によるスパイダ ソリティア\n\nCardLib バージョン 1.0"
+    IDS_SPI_ABOUT "Gregor Schneider によるスパイダ ソリティア\nCardLib バージョン 1.0"
     IDS_SPI_QUIT "現在のゲームを終了しますか?"
     IDS_SPI_WIN "おめでとう、あなたの勝ちです!"
     IDS_SPI_DEAL "もう一度カードを配りますか?"
diff --git a/base/applications/games/spider/lang/nl-NL.rc b/base/applications/games/spider/lang/nl-NL.rc
index a68639eddb5..0fd47f1f5f3 100644
--- a/base/applications/games/spider/lang/nl-NL.rc
+++ b/base/applications/games/spider/lang/nl-NL.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider Solitaire"
-    IDS_SPI_ABOUT "Spider Solitaire door Gregor Schneider\n\nCardLib versie 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire door Gregor Schneider\nCardLib versie 1.0"
     IDS_SPI_QUIT "Het huidige spel afsluiten?"
     IDS_SPI_WIN "Gefeliciteerd, u heeft gewonnen!"
     IDS_SPI_DEAL "Nogmaals spelen?"
diff --git a/base/applications/games/spider/lang/pl-PL.rc b/base/applications/games/spider/lang/pl-PL.rc
index f44421e142a..d67f32ebb4c 100644
--- a/base/applications/games/spider/lang/pl-PL.rc
+++ b/base/applications/games/spider/lang/pl-PL.rc
@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Pająk"
-    IDS_SPI_ABOUT "Pasjans - Pająk, autor: Gregor Schneider\n\nCardLib wersja 1.0"
+    IDS_SPI_ABOUT "Pasjans - Pająk, autor: Gregor Schneider\nCardLib wersja 1.0"
     IDS_SPI_QUIT "Czy na pewno chcesz zakończyć?"
     IDS_SPI_WIN "Gratulacje, wygrałeś(aś)!"
     IDS_SPI_DEAL "Rozdać ponownie?"
diff --git a/base/applications/games/spider/lang/pt-BR.rc b/base/applications/games/spider/lang/pt-BR.rc
index dae2ab6e86e..4f24fa9b701 100644
--- a/base/applications/games/spider/lang/pt-BR.rc
+++ b/base/applications/games/spider/lang/pt-BR.rc
@@ -40,7 +40,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Paciência Spider por Gregor Schneider\n\nCardLib versão 1.0"
+    IDS_SPI_ABOUT "Paciência Spider por Gregor Schneider\nCardLib versão 1.0"
     IDS_SPI_QUIT "Desistir do jogo atual?"
     IDS_SPI_WIN "Parabéns, você venceu!"
     IDS_SPI_DEAL "Deseja jogar mais uma partida?"
diff --git a/base/applications/games/spider/lang/ro-RO.rc b/base/applications/games/spider/lang/ro-RO.rc
index ebffd5fca0a..471e1778f20 100644
--- a/base/applications/games/spider/lang/ro-RO.rc
+++ b/base/applications/games/spider/lang/ro-RO.rc
@@ -42,7 +42,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Pasiență-păianjen"
-    IDS_SPI_ABOUT "Pasiență-păianjen de Gregor Schneider\n\nCardLib versiune 1.0"
+    IDS_SPI_ABOUT "Pasiență-păianjen de Gregor Schneider\nCardLib versiune 1.0"
     IDS_SPI_QUIT "Abandonați jocul curent?"
     IDS_SPI_WIN "Felicitări, ați câștigat!"
     IDS_SPI_DEAL "O nouă rundă?"
diff --git a/base/applications/games/spider/lang/ru-RU.rc b/base/applications/games/spider/lang/ru-RU.rc
index 73a72d341f7..545c7004351 100644
--- a/base/applications/games/spider/lang/ru-RU.rc
+++ b/base/applications/games/spider/lang/ru-RU.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Пасьянс ""Паук"""
-    IDS_SPI_ABOUT "Пасьянс ""Паук"", Gregor Schneider\n\nCardLib версии 1.0"
+    IDS_SPI_ABOUT "Пасьянс ""Паук"", Gregor Schneider\nCardLib версии 1.0"
     IDS_SPI_QUIT "Выйти из текущей игры?"
     IDS_SPI_WIN "Поздравляем, вы выиграли!"
     IDS_SPI_DEAL "Попробовать снова?"
diff --git a/base/applications/games/spider/lang/sk-SK.rc b/base/applications/games/spider/lang/sk-SK.rc
index b4cb268e88e..45c5592350e 100644
--- a/base/applications/games/spider/lang/sk-SK.rc
+++ b/base/applications/games/spider/lang/sk-SK.rc
@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Pavúčí solitér" //Spider
-    IDS_SPI_ABOUT "Pavúčí solitér od Gregor Schneider\n\nCardLib verzia 1.0"
+    IDS_SPI_ABOUT "Pavúčí solitér od Gregor Schneider\nCardLib verzia 1.0"
     IDS_SPI_QUIT "Naozaj chcete skončiť aktuálnu hru?"
     IDS_SPI_WIN "Blahoželám, vyhrali ste!"
     IDS_SPI_DEAL "Rozdať znova?"
diff --git a/base/applications/games/spider/lang/sq-AL.rc b/base/applications/games/spider/lang/sq-AL.rc
index d0de5ad9cc6..c4d187ffa5d 100644
--- a/base/applications/games/spider/lang/sq-AL.rc
+++ b/base/applications/games/spider/lang/sq-AL.rc
@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Merimange"
-    IDS_SPI_ABOUT "Merimanga Solitare Nga Gregor Schneider\n\nCardLib versioni 1.0"
+    IDS_SPI_ABOUT "Merimanga Solitare Nga Gregor Schneider\nCardLib versioni 1.0"
     IDS_SPI_QUIT "Dil nga Loja?"
     IDS_SPI_WIN "Urime, keni fituar!"
     IDS_SPI_DEAL "Fillo Perseri?"
diff --git a/base/applications/games/spider/lang/sv-SE.rc b/base/applications/games/spider/lang/sv-SE.rc
index c49a336f929..6abe795fce8 100644
--- a/base/applications/games/spider/lang/sv-SE.rc
+++ b/base/applications/games/spider/lang/sv-SE.rc
@@ -47,7 +47,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider"
-    IDS_SPI_ABOUT "Spider Solitaire av Gregor Schneider\nÖversätt av Ronny K Svensson\n\nCardLib version 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire av Gregor Schneider; Översätt av Ronny K Svensson\nCardLib version 1.0"
     IDS_SPI_QUIT "Avsluta ditt nuvarande spel?"
     IDS_SPI_WIN "Grattis, du vann!"
     IDS_SPI_DEAL "Ge igen?"
diff --git a/base/applications/games/spider/lang/tr-TR.rc b/base/applications/games/spider/lang/tr-TR.rc
index 98a39e3a9bb..cd2f253ad0b 100644
--- a/base/applications/games/spider/lang/tr-TR.rc
+++ b/base/applications/games/spider/lang/tr-TR.rc
@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Spider Solitaire"
-    IDS_SPI_ABOUT "Spider Solitaire, Gregor Schneider tarafından yazılmıştır.\n\nCardLib sürümü: 1.0"
+    IDS_SPI_ABOUT "Spider Solitaire, Gregor Schneider tarafından yazılmıştır.\nCardLib sürümü: 1.0"
     IDS_SPI_QUIT "Şimdiki oyundan çıkılsın mı?"
     IDS_SPI_WIN "Tebrikler, kazandınız!"
     IDS_SPI_DEAL "Yeniden dağıtılsın mı?"
diff --git a/base/applications/games/spider/lang/uk-UA.rc b/base/applications/games/spider/lang/uk-UA.rc
index 7cd813603d1..eb5294764ee 100644
--- a/base/applications/games/spider/lang/uk-UA.rc
+++ b/base/applications/games/spider/lang/uk-UA.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "Пас’янс Паук"
-    IDS_SPI_ABOUT "Пас’янс Паук, Gregor Schneider\n\nCardLib версії 1.0"
+    IDS_SPI_ABOUT "Пас’янс Паук, Gregor Schneider\nCardLib версії 1.0"
     IDS_SPI_QUIT "Вийти з поточної гри?"
     IDS_SPI_WIN "Вітаємо, ви виграли!"
     IDS_SPI_DEAL "Спробувати знову?"
diff --git a/base/applications/games/spider/lang/zh-CN.rc b/base/applications/games/spider/lang/zh-CN.rc
index 092af9b2153..f151155096a 100644
--- a/base/applications/games/spider/lang/zh-CN.rc
+++ b/base/applications/games/spider/lang/zh-CN.rc
@@ -48,7 +48,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME "蜘蛛纸牌"
-    IDS_SPI_ABOUT "蜘蛛纸牌 作者：Gregor Schneider\n\n使用 CardLib 版本 1.0"
+    IDS_SPI_ABOUT "蜘蛛纸牌 作者：Gregor Schneider\n使用 CardLib 版本 1.0"
     IDS_SPI_QUIT "退出当前游戏吗？"
     IDS_SPI_WIN "祝贺您赢了！"
     IDS_SPI_DEAL "再来一次吗？"
diff --git a/base/applications/games/spider/spider.cpp b/base/applications/games/spider/spider.cpp
index a301254bc27..b7aa307b607 100644
--- a/base/applications/games/spider/spider.cpp
+++ b/base/applications/games/spider/spider.cpp
@@ -9,6 +9,7 @@
 #include "spider.h"
 
 #include <commctrl.h>
+#include <shellapi.h>
 #include <tchar.h>
 
 TCHAR szHelpPath[MAX_PATH];
@@ -365,7 +366,8 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
                     return 0;
 
                 case IDM_HELP_ABOUT:
-                    MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION);
+                    ShellAbout(hwnd, szAppName, MsgAbout,
+                               LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SPIDER)));
                     return 0;
 
                 case IDM_GAME_EXIT: