[dreimer] 32377: Synched winhelp and wordpad to Wine 0.9.55. To the translators that translated winhelp to Greek, Lithuan, Portugese and Ukrainian. Can you please send your translations to winehq? I will keep them anyway, but this way its easier to keep synched.

Author: dreimer
Date: Fri Feb 15 18:04:14 2008
New Revision: 32377

URL: http://svn.reactos.org/svn/reactos?rev=32377&view=rev
Log:
Synched winhelp and wordpad to Wine 0.9.55.
To the translators that translated winhelp to Greek, Lithuan, Portugese and Ukrainian. Can
you please send your translations to winehq? I will keep them anyway, but this way its
easier to keep synched.

Modified:
    trunk/reactos/base/applications/winhelp/lang/bg-BG.rc
    trunk/reactos/base/applications/winhelp/lang/es-ES.rc
    trunk/reactos/base/applications/wordpad/registry.c

Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/…
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/bg-BG.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/bg-BG.rc Fri Feb 15 18:04:14 2008
@@ -1,8 +1,7 @@
 /*
- * Help Viewer
+ * Help Viewer Bulgarian resource
  *
- * Copyright 1996 Ulrich Schmid
- * Copyright 2002 Sylvain Petreolle <spetreolle(a)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?"
+}

Modified: trunk/reactos/base/applications/winhelp/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/…
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/es-ES.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/es-ES.rc Fri Feb 15 18:04:14 2008
@@ -44,7 +44,7 @@
    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_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?"
 }

Modified: trunk/reactos/base/applications/wordpad/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/registry.c (original)
+++ trunk/reactos/base/applications/wordpad/registry.c Fri Feb 15 18:04:14 2008
@@ -187,7 +187,7 @@
     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)