diff --git a/po/ar.po b/po/ar.po
index 9122d94e4f6..1c71272609d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12444,7 +12444,7 @@ msgstr "تاكيد حذف القيمة"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "سلسلة البحث '%s' غير موجودة"
 
 #: regedit.rc:186
diff --git a/po/bg.po b/po/bg.po
index aab51e87bc6..3474eed4cba 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12046,7 +12046,7 @@ msgid "Confirm Value Delete"
 msgstr "Потвърдете изтриването на стойността"
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/ca.po b/po/ca.po
index e4606574bb3..a6cf4847992 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12303,7 +12303,7 @@ msgstr "Confirmar eliminació de valor"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Cadena de cerca '%s' no trobada"
 
 #: regedit.rc:186
diff --git a/po/cs.po b/po/cs.po
index 4ec053834a6..5fc69ae063c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12133,7 +12133,7 @@ msgstr "Potvrďte smazání položky"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Hledaný řetězec „%s“ nebyl nalezen"
 
 #: regedit.rc:186
diff --git a/po/da.po b/po/da.po
index 47d2874c90d..c5929c8f8c4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12401,7 +12401,7 @@ msgstr "Bekræft sletning af værdi"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Fandt ikke søgestrengen '%s'"
 
 #: regedit.rc:186
diff --git a/po/de.po b/po/de.po
index e79b386eaf2..dedcd7e4582 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12281,7 +12281,7 @@ msgstr "Bitte bestätigen"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Suchfolge '%s' wurde nicht gefunden"
 
 #: regedit.rc:186
diff --git a/po/el.po b/po/el.po
index 93cb84e393f..642ca83e9a4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11809,7 +11809,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/en.po b/po/en.po
index 6edb204692f..f65b09a07bb 100644
--- a/po/en.po
+++ b/po/en.po
@@ -12184,8 +12184,8 @@ msgid "Confirm Value Delete"
 msgstr "Confirm Value Delete"
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
-msgstr "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
+msgstr "Search complete. The string '%1' was not found."
 
 #: regedit.rc:186
 msgid "Are you sure you want to delete these values?"
diff --git a/po/en_US.po b/po/en_US.po
index 7801bb7ad13..ba75d47c5e9 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -12184,8 +12184,8 @@ msgid "Confirm Value Delete"
 msgstr "Confirm Value Delete"
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
-msgstr "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
+msgstr "Search complete. The string '%1' was not found."
 
 #: regedit.rc:186
 msgid "Are you sure you want to delete these values?"
diff --git a/po/eo.po b/po/eo.po
index 19018d3c7f1..a99e8dfb881 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11732,7 +11732,7 @@ msgstr "Konfirmi forigon de valoro"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Mi ne trovis la ĉenon %s"
 
 #: regedit.rc:186
diff --git a/po/es.po b/po/es.po
index 77ad07250ca..cbd76c764b8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12482,7 +12482,7 @@ msgstr "Confirmar eliminación de valor"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Cadena de búsqueda '%s' no encontrada"
 
 #: regedit.rc:186
diff --git a/po/fa.po b/po/fa.po
index 7b0816124c4..94066cd9d36 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -11807,7 +11807,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/fi.po b/po/fi.po
index 2623054ca33..56d966bd5f6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12178,7 +12178,7 @@ msgstr "Vahvista arvon tuhoaminen"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Haettua merkkijonoa '%s' ei löydy"
 
 #: regedit.rc:186
diff --git a/po/fr.po b/po/fr.po
index bf30f91a460..3eb884d7d84 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12354,7 +12354,7 @@ msgstr "Confirmez l'effacement de valeur"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Occurrence de « %s » non trouvée"
 
 #: regedit.rc:186
diff --git a/po/he.po b/po/he.po
index 6e0890052e3..4755220ecc3 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12215,7 +12215,7 @@ msgstr "אישור מחיקת הערך"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "מחרוזת החיפוש ׳%s׳ לא נמצאה"
 
 #: regedit.rc:186
diff --git a/po/hi.po b/po/hi.po
index d19ada6daac..1a0f55eb89c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -11597,7 +11597,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/hr.po b/po/hr.po
index 1b3294519ad..5528f586981 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11947,7 +11947,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/hu.po b/po/hu.po
index d13399577fe..3d26103d5e8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12397,7 +12397,7 @@ msgstr "Értéktörlés jóváhagyása"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "A(z) '%s' keresési kifejezés nem található"
 
 #: regedit.rc:186
diff --git a/po/it.po b/po/it.po
index 48754005b81..058de974edb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12482,7 +12482,7 @@ msgstr "Confermare l'eliminazione del valore"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Stringa di ricerca '%s' non trovata"
 
 #: regedit.rc:186
diff --git a/po/ja.po b/po/ja.po
index d97ea304ccb..cca8d224aef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12187,7 +12187,7 @@ msgstr "値の削除確認"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "検索文字列 '%s'が見つかりません"
 
 #: regedit.rc:186
diff --git a/po/ko.po b/po/ko.po
index 68d6df76353..b581d987d4d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -12466,7 +12466,7 @@ msgstr "값 지우기 확인"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "'%s'을 찾을 수 없습니다"
 
 #: regedit.rc:186
diff --git a/po/lt.po b/po/lt.po
index e3297f74676..24bac03240f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -12204,7 +12204,7 @@ msgstr "Reikšmės šalinimo patvirtinimas"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Ieškoma eilutė „%s“ nerasta"
 
 #: regedit.rc:186
diff --git a/po/ml.po b/po/ml.po
index abf1f3194e8..ac446cc84fd 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -11597,7 +11597,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 65bccf8a2ce..f15ccf154bf 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -12200,7 +12200,7 @@ msgstr "Bekreft sletting av verdi"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Fant ikke søkestrengen \"%s\""
 
 #: regedit.rc:186
diff --git a/po/nl.po b/po/nl.po
index 4b5647a9009..594ec36762a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12446,7 +12446,7 @@ msgstr "Waarde verwijderen bevestigen"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Tekenreeks '%s' niet gevonden"
 
 #: regedit.rc:186
diff --git a/po/or.po b/po/or.po
index 5216d11a5b2..d428a3f3353 100644
--- a/po/or.po
+++ b/po/or.po
@@ -11597,7 +11597,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/pa.po b/po/pa.po
index 926a393fb04..354bfc2446f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11597,7 +11597,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/pl.po b/po/pl.po
index 63f24efe6a3..70431c0f627 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12294,7 +12294,7 @@ msgstr "Potwierdzenie kasowania"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Nie udało się wyszukać ciągu '%s'"
 
 #: regedit.rc:186
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4531650242c..bc4a4abb5f4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12265,7 +12265,7 @@ msgstr "Confirmar Exclusão de Valor"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Chave de busca '%s' não encontrada"
 
 #: regedit.rc:186
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ca7e68aacbc..550f4f7a61f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -12276,7 +12276,7 @@ msgstr "Confirmar exclusão de valor"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Chave de pesquisa '%s' não encontrada"
 
 #: regedit.rc:186
diff --git a/po/rm.po b/po/rm.po
index a1d58fd576e..934e4cdea0b 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -11692,7 +11692,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/ro.po b/po/ro.po
index c4591319c0f..bad6b1599bc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -12190,7 +12190,7 @@ msgstr "Confirmă ștergerea valorii"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Șirul de căutare „%s” nu a fost găsit"
 
 #: regedit.rc:186
diff --git a/po/ru.po b/po/ru.po
index 41a209423be..de3382b5db8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12201,7 +12201,7 @@ msgstr "Подтверждение"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Искомая строка «%s» не найдена"
 
 #: regedit.rc:186
diff --git a/po/sk.po b/po/sk.po
index ed58127bb57..0f0fba13f29 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11913,7 +11913,7 @@ msgstr "Potvrdenie zmazania hodnoty"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Hľadaný výraz '%s' nebol nájdený"
 
 #: regedit.rc:186
diff --git a/po/sl.po b/po/sl.po
index df35329cbbb..e342e26c9d3 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12421,7 +12421,7 @@ msgstr "Potrditev brisanja vrednosti"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Iskanega niza '%s' ni mogoče najti"
 
 #: regedit.rc:186
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 0ca05916336..70cc4b6173b 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -12314,7 +12314,7 @@ msgstr "Потврда брисања датотеке"
 
 #: regedit.rc:189
 #, fuzzy
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "%s путања није пронађена"
 
 #: regedit.rc:186
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index dfb243b8b7a..9c2452c95c3 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -12465,7 +12465,7 @@ msgstr "Potvrda brisanja datoteke"
 
 #: regedit.rc:189
 #, fuzzy
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "%s putanja nije pronađena"
 
 #: regedit.rc:186
diff --git a/po/sv.po b/po/sv.po
index dc2d22e2f90..11fc682e36e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12094,7 +12094,7 @@ msgstr "Bekräfta borttagning av värde"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Hittade inte den sökta strängen '%s'"
 
 #: regedit.rc:186
diff --git a/po/te.po b/po/te.po
index f0f715f0ad0..6479513418a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -11597,7 +11597,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/th.po b/po/th.po
index 9548548dc24..8804ba93d85 100644
--- a/po/th.po
+++ b/po/th.po
@@ -11847,7 +11847,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/tr.po b/po/tr.po
index 2d225bf6445..d44d5e15f76 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12219,7 +12219,7 @@ msgstr "Değer silmeyi onayla"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Arama dizesi '%s' bulunamadı"
 
 #: regedit.rc:186
diff --git a/po/uk.po b/po/uk.po
index af423fb14c5..6a2d79d6649 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12290,7 +12290,7 @@ msgstr "Підтвердження видалення значення"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "Шукане значення '%s' не знайдене"
 
 #: regedit.rc:186
diff --git a/po/wa.po b/po/wa.po
index 5777d73a0d7..d39933c549a 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -11755,7 +11755,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/wine.pot b/po/wine.pot
index 7188bb071a4..9cf49a0ca21 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -11532,7 +11532,7 @@ msgid "Confirm Value Delete"
 msgstr ""
 
 #: regedit.rc:189
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr ""
 
 #: regedit.rc:186
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ae929001889..f71f86c9f13 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11984,7 +11984,7 @@ msgstr "确认删除值"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "未找到字符串 '%s'"
 
 #: regedit.rc:186
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a320947e385..5e2327184fc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12351,7 +12351,7 @@ msgstr "確認刪除數值"
 #: regedit.rc:189
 #, fuzzy
 #| msgid "Search string '%s' not found"
-msgid "The search string '%1' was not found."
+msgid "Search complete. The string '%1' was not found."
 msgstr "找不到搜尋的字串 %s"
 
 #: regedit.rc:186
diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index 64ecfcbbd10..72f685c4071 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -64,7 +64,7 @@ static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_l
     return ret;
 }
 
-static INT __cdecl messagebox(HWND hwnd, INT buttons, INT titleId, INT resId, ...)
+int __cdecl messagebox(HWND hwnd, int buttons, int titleId, int resId, ...)
 {
     __ms_va_list ap;
     INT result;
@@ -76,7 +76,7 @@ static INT __cdecl messagebox(HWND hwnd, INT buttons, INT titleId, INT resId, ..
     return result;
 }
 
-void __cdecl error_code_messagebox(HWND hwnd, unsigned int msg_id, ...)
+static void __cdecl error_code_messagebox(HWND hwnd, unsigned int msg_id, ...)
 {
     __ms_va_list ap;
 
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 018759e0e9c..0f0ce2f8870 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -773,7 +773,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                     SetFocus(g_pChildWnd->hTreeWnd);
                 }
             } else {
-                error_code_messagebox(hWnd, IDS_NOTFOUND, searchString);
+                messagebox(hWnd, MB_OK|MB_ICONINFORMATION, IDS_APP_TITLE, IDS_NOTFOUND, searchString);
             }
         }
         break;
diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index bbf6c09b227..73f49e28a5f 100644
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -143,7 +143,7 @@ extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath);
 extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox);
 extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName);
 extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName);
-extern void __cdecl error_code_messagebox(HWND hwnd, unsigned int msg_id, ...);
+extern int __cdecl messagebox(HWND hwnd, int buttons, int titleId, int resId, ...);
 
 /* hexedit.c */
 extern void HexEdit_Register(void);
diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc
index c717debb6fa..82b1d43f83a 100644
--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -185,7 +185,7 @@ BEGIN
     IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?"
     IDS_NEWKEY              "New Key #%d"
     IDS_NEWVALUE            "New Value #%d"
-    IDS_NOTFOUND            "The search string '%1' was not found."
+    IDS_NOTFOUND            "Search complete. The string '%1' was not found."
 END
 
 STRINGTABLE