diff --git a/reactos/base/applications/winhelp/lang/bg-BG.rc b/reactos/base/applications/winhelp/lang/bg-BG.rc
index fb9155d1ba5..d04a9d077da 100644
--- a/reactos/base/applications/winhelp/lang/bg-BG.rc
+++ b/reactos/base/applications/winhelp/lang/bg-BG.rc
@@ -1,8 +1,7 @@
 /*
- * Help Viewer
+ * Help Viewer Bulgarian resource
  *
- * Copyright 1996 Ulrich Schmid
- * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
+ * Copyright 2005 Milko Krachounov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,59 +18,52 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
-BEGIN
- POPUP "&Файл"
- BEGIN
-  MENUITEM "&Отваряне", MNID_FILE_OPEN
+MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+{
+ POPUP "&Файл" {
+  MENUITEM "&Отвори", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Печат", MNID_FILE_PRINT
-  MENUITEM "&Настройки на печатача...", MNID_FILE_SETUP
+  MENUITEM "&Настройка на принтера...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "Из&ход", MNID_FILE_EXIT
- END
- POPUP "&Обработка"
- BEGIN
-   MENUITEM "За&помняне", MNID_EDIT_COPYDLG
+  MENUITEM "&Изход", MNID_FILE_EXIT
+ }
+ POPUP "&Редактиране" {
+   MENUITEM "&Копирай...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Разясняване...", MNID_EDIT_ANNOTATE
- END
- POPUP "&Отметка"
- BEGIN
-   MENUITEM "&Задаване...", MNID_BKMK_DEFINE
- END
- POPUP "Помо&щ"
- BEGIN
-   MENUITEM "Помощ за &помощта", MNID_HELP_HELPON
-   MENUITEM "Винаги отгоре", MNID_HELP_HELPTOP
+   MENUITEM "&Анотирай...", MNID_EDIT_ANNOTATE
+ }
+ POPUP "&Отметки" {
+   MENUITEM "&Задай...", MNID_BKMK_DEFINE
+ }
+ POPUP "&Помощ" {
+   MENUITEM "Помощ &за помощта", MNID_HELP_HELPON
+   MENUITEM "Винаги от&горе", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Сведения...", MNID_HELP_ABOUT
+   MENUITEM "&Информация...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&За...", MNID_HELP_WINE
+   MENUITEM "&Относно WINE", MNID_HELP_WINE
 #endif
- END
-END
+ }
+}
 
 /* Strings */
-
-STRINGTABLE DISCARDABLE
-BEGIN
-STID_WINE_HELP, 	"Помощ"
+STRINGTABLE DISCARDABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+{
+STID_WINE_HELP, 	"WINE Помощ"
 STID_WHERROR, 		"ГРЕШКА"
 STID_WARNING,  		"ПРЕДУПРЕЖДЕНИЕ"
-STID_INFO,  		"Сведение"
-STID_NOT_IMPLEMENTED, 	"Не е готово"
-STID_HLPFILE_ERROR_s, 	"Грешка при четене на помощен файл `%s'"
+STID_INFO,  		"Информация"
+STID_NOT_IMPLEMENTED, 	"Не е реализирано"
+STID_HLPFILE_ERROR_s, 	"Грешка при четене на помощния файл `%s'"
 STID_CONTENTS, 		"&Съдържание"
-STID_SEARCH, 		"&Търсене"
-STID_BACK, 		"На&зад"
-STID_HISTORY, 		"&Дневник"
+STID_SEARCH, 		"&Търси"
+STID_BACK, 		"&Назад"
+STID_HISTORY, 		"&История"
 STID_TOPICS,		"&Теми"
 STID_ALL_FILES, 	"Всички файлове (*.*)"
 STID_HELP_FILES_HLP, 	"Помощни файлове (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Не намирам '%s'. Искате ли да го намерите сами?"
-END
+STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
+}
diff --git a/reactos/base/applications/winhelp/lang/es-ES.rc b/reactos/base/applications/winhelp/lang/es-ES.rc
index e05d3bc0f6c..93d9223bd39 100644
--- a/reactos/base/applications/winhelp/lang/es-ES.rc
+++ b/reactos/base/applications/winhelp/lang/es-ES.rc
@@ -44,7 +44,7 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
    MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
    MENUITEM "&Siempre visible", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Informaciуn...", MNID_HELP_ABOUT
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
    MENUITEM "&Acerca de WINE", MNID_HELP_WINE
 #endif
@@ -67,5 +67,5 @@ STID_HISTORY, 		"&Historial"
 STID_TOPICS,		"&Temas"
 STID_ALL_FILES, 	"Todos los archivos (*.*)"
 STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
-STID_FILE_NOT_FOUND_s	"No pudo encontrar '%s'. їDesea buscar este archivo manualmente?"
+STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 }
diff --git a/reactos/base/applications/wordpad/registry.c b/reactos/base/applications/wordpad/registry.c
index 196e7d1a073..aef152a235a 100644
--- a/reactos/base/applications/wordpad/registry.c
+++ b/reactos/base/applications/wordpad/registry.c
@@ -187,7 +187,7 @@ static void format_filelist_filename(LPWSTR file, LPWSTR out)
     else if(truncpos1 == truncpos2 || !truncpos2)
         lstrcatW(out, file);
     else
-        truncate_path(file, out, truncpos1, truncpos2 ? truncpos2 : (pos_basename-1));
+        truncate_path(file, out, truncpos1, truncpos2);
 }
 
 void registry_read_filelist(HWND hMainWnd)