[dreimer] 47854: Update reg, xcopy, winhlp32, wordpad to Wine 1.2rc5

Author: dreimer
Date: Sat Jun 26 13:56:41 2010
New Revision: 47854

URL: http://svn.reactos.org/svn/reactos?rev=47854&view=rev
Log:
Update reg, xcopy, winhlp32, wordpad to Wine 1.2rc5

Added:
    trunk/reactos/base/applications/cmdutils/reg/Ro.rc   (with props)
    trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc   (with props)
Modified:
    trunk/reactos/base/applications/cmdutils/reg/rsrc.rc
    trunk/reactos/base/applications/cmdutils/xcopy/En.rc
    trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc
    trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
    trunk/reactos/base/applications/winhlp32/Es.rc
    trunk/reactos/base/applications/winhlp32/Nl.rc
    trunk/reactos/base/applications/winhlp32/Pl.rc
    trunk/reactos/base/applications/winhlp32/Ru.rc
    trunk/reactos/base/applications/winhlp32/macro.c
    trunk/reactos/base/applications/winhlp32/winhelp.c
    trunk/reactos/base/applications/wordpad/Hu.rc
    trunk/reactos/base/applications/wordpad/No.rc
    trunk/reactos/base/applications/wordpad/Pt.rc
    trunk/reactos/base/applications/wordpad/Ru.rc
    trunk/reactos/base/applications/wordpad/Tr.rc
    trunk/reactos/base/applications/wordpad/Zh.rc
    trunk/reactos/base/applications/wordpad/print.c
    trunk/reactos/base/applications/wordpad/wordpad.c
    trunk/reactos/base/applications/wordpad/wordpad.h

Added: trunk/reactos/base/applications/cmdutils/reg/Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/Ro.rc (added)
+++ trunk/reactos/base/applications/cmdutils/reg/Ro.rc [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -1,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ *
+ * Copyright 2008 Andrew Riedi
+ * Copyright 2010 Claudia Cotună
+ *                Michael Stefaniuc
+ *
+ * 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 "reg.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    STRING_USAGE, "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY
]\nREG comandă /?\n"
+    STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s
separator] [/d date] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va]
[/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n"
+    STRING_SUCCESS, "Operațiunea a fost finalizată cu succes\n"
+    STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n"
+    STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de
comandă\n"
+    STRING_NO_REMOTE, "Eroare: Nu se pot adăuga chei pe calculatorul de la
distanță\n"
+    STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut găsi cheia sau valoarea de
registru specificată\n"
+}

Propchange: trunk/reactos/base/applications/cmdutils/reg/Ro.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/cmdutils/reg/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/rsrc.rc [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -13,6 +13,7 @@
 #include "Lt.rc"
 #include "No.rc"
 #include "Pt.rc"
+#include "Ro.rc"
 #include "Ru.rc"
 #include "Si.rc"
 #include "Uk.rc"

Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -53,8 +53,8 @@
 \n\
 Where:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or\n\
-\tmore files\n\
+[/I]  Assume directory if destination does not exist and copying two or\n\
+\      more files\n\
 [/S]  Copy directories and subdirectories\n\
 [/E]  Copy directories and subdirectories, including any empty ones\n\
 [/Q]  Do not list names during copy, ie quiet.\n\
@@ -72,7 +72,7 @@
 [/C]  Continue even if an error occurs during the copy\n\
 [/A]  Only copy files with archive attribute set\n\
 [/M]  Only copy files with archive attribute set, removes\n\
-\tarchive attribute\n\
+\      archive attribute\n\
 [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
 \t\tIf no date is supplied, only copy if destination is older\n\
 \t\tthan source\n\n"

Added: trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc (added)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -1,0 +1,80 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ *
+ * Copyright (C) 2007 J. Edmeades
+ * Copyright (C) 2010 Claudia Cotună
+ *                    Michael Stefaniuc
+ *
+ * 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 "xcopy.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "Număr de parametri nevalid - Utilizați xcopy /? pentru
ajutor\n"
+    STRING_INVPARM,  "Parametru nevalid „%s” -  Utilizați xcopy /? pentru
ajutor\n"
+    STRING_PAUSE,    "Apăsați pe <enter> pentru a începe copierea\n"
+    STRING_SIMCOPY,  "%d fișier(e) ar fi copiat(e)\n"
+    STRING_COPY,     "%d fișier(e) copiat(e)\n"
+    STRING_QISDIR,   "„%s” este un nume de fișier sau un director\ndin
destinație?\n(F - Fișier, D - Director)\n"
+    STRING_SRCPROMPT,"%s? (Da|Nu)\n"
+    STRING_OVERWRITE,"Se suprascrie %s? (Da|Nu|Toate)\n"
+    STRING_COPYFAIL, "Copierea „%s” în „%s” a eșuat cu cod de retur
%d\n"
+    STRING_OPENFAIL, "Deschiderea „%s” a eșuat\n"
+    STRING_READFAIL, "Citirea „%s” a eșuat\n"
+    STRING_YES_CHAR, "D"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "T"
+    STRING_FILE_CHAR,"F"
+    STRING_DIR_CHAR, "D"
+
+    STRING_HELP,
+"XCOPY - Copiază fișiere sau arbori de directoare sursă într-o destinație\n\
+\n\
+Sintaxă:\n\
+XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\            [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\nCu:\n\
+\n\
+[/I]  Creează director dacă destinația nu există și se copiază două sau\n\
+\      mai multe fișiere\n\
+[/S]  Copiază directoarele și subdirectoarele\n\
+[/E]  Copiază directoarele și subdirectoarele, inclusiv pe cele goale\n\
+[/Q]  Nu afișa numele în timpul copierii.\n\
+[/F]  Arată numele întreg pentru sursă și destinație în timpul copierii\n\
+[/L]  Simulează operațiunea, afișând numele care ar fi copiate\n\
+[/W]  Solicită confirmarea înainte de a începe copierea\n\
+[/T]  Creează o structură de directoare goale, dar nu copiază fișiere\n\
+[/Y]  Nu solicita confirmarea la suprascrierea fișierelor\n\
+[/-Y] Solicită confirmarea la suprascrierea fișierelor\n\
+[/P]  Solicită confirmarea înainte de copierea fiecărui fișier sursă\n\
+[/N]  Copiază utilizând prescurtări de nume\n\
+[/U]  Copiază numai fișierele care există deja în destinație\n\
+[/R]  Suprascrie orice fișiere cu protecție la modificări\n\
+[/H]  Include în copie fișierele ascunse și de sistem\n\
+[/C]  Continuă chiar dacă apare o eroare în timpul copierii\n\
+[/A]  Copiază numai fișierele cu atributul de arhivă activat\n\
+[/M]  Copiază numai fișierele cu atributul de arhivă activat, dezactivează\n\
+\      apoi atributul\n\
+[/D | /D:m-d-y] Copiază fișierele noi sau pe cele modificate după data\n\
+\t\tspecificată. Dacă nu este specificată nici o dată, copiază\n\
+\t\tnumai dacă fișierul destinație este mai vechi decât fișierul\n\
+\t\tsursă\n\n"
+}

Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -35,7 +35,7 @@
     STRING_INVPARM,
 "Недопустимый параметр '%s' - попробуйте
'xcopy /?' для получения подробного\n\
 описания.\n"
-    STRING_PAUSE,    "Нажмите клавишу <enter>, чтобы
начать копирование.\n"
+    STRING_PAUSE,    "Нажмите клавишу <Enter>, чтобы
начать копирование.\n"
     STRING_SIMCOPY,  "%d файл(ов) было бы
скопировано.\n"
     STRING_COPY,     "%d файл(ов) скопировано.\n"
     STRING_QISDIR,   "'%s' является файлом или
папкой?\n" \

Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sat Jun 26
13:56:41 2010
@@ -40,6 +40,7 @@
 #include "Ja.rc"
 #include "Lt.rc"
 #include "Nl.rc"
+#include "Ro.rc"
 #include "Ru.rc"
 #include "Si.rc"
 #include "Uk.rc"

Modified: trunk/reactos/base/applications/winhlp32/Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/Es.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/Es.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -42,21 +42,21 @@
  POPUP "&Marcador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
- POPUP "&Options" {
-   POPUP	"Help always visible"
+ POPUP "&Opciones" {
+   POPUP	"Ayuda siempre visible"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Por defecto",	MNID_OPTS_HELP_DEFAULT
      MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "No visible",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  MENUITEM "Historial",		MNID_OPTS_HISTORY
+  POPUP    "Fuentes"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Pequeña",		MNID_OPTS_FONTS_SMALL
     MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Grande",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "Usar colores del sistema",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "A&yuda" {
    MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
@@ -69,6 +69,22 @@
  }
 }
 
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Índice"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_BORDER
+}
+
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Buscar"
+{
+    LTEXT  "Aún no implementado", -1, 10, 10, 180, 150
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 {
@@ -79,11 +95,11 @@
 STID_NOT_IMPLEMENTED, 	"Aún no implementado"
 STID_HLPFILE_ERROR_s, 	"Error al leer el archivo de ayuda `%s'"
 STID_INDEX, 		"&Índice"
-STID_CONTENTS,		"Summary"
+STID_CONTENTS,		"Resumen"
 STID_BACK, 		"&Anterior"
 STID_ALL_FILES, 	"Todos los archivos (*.*)"
 STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file
yourself?"
-STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
-STID_PSH_INDEX,		"Help topics: "
+STID_FILE_NOT_FOUND_s	"No se pudo encontrar '%s'. ¿Desea buscar este archivo
usted mismo?"
+STID_NO_RICHEDIT	"No se pudo encontrar una implementación de richedit...
Abortando"
+STID_PSH_INDEX,		"Temas de ayuda: "
 }

Modified: trunk/reactos/base/applications/winhlp32/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -113,7 +113,7 @@
 	BEGIN
 		MENUITEM "Annotering...",       MNID_CTXT_ANNOTATE
 		MENUITEM "Kopiëren",            MNID_CTXT_COPY
-		MENUITEM "Afdrukken ...",       MNID_CTXT_PRINT
+		MENUITEM "Afdrukken...",        MNID_CTXT_PRINT
 		POPUP    "Lettertype"
 		BEGIN
 			MENUITEM "Klein",       MNID_CTXT_FONTS_SMALL

Modified: trunk/reactos/base/applications/winhlp32/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/Pl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/Pl.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -4,6 +4,7 @@
  * Copyright 1996 Ulrich Schmid
  * Copyright 2002 Sylvain Petreolle &lt;spetreolle(a)yahoo.fr&gt;
  * Copyright 2004 Piotr Caban
+ * Copyright 2010 £ukasz Wojni³owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,9 +23,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Plik" {
   MENUITEM "&Otwórz", MNID_FILE_OPEN
@@ -43,20 +46,20 @@
    MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE
  }
  POPUP "&Options" {
-   POPUP	"Help always visible"
+   POPUP	"Pomoc zawsze widoczna"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "Domyœlnie",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Widoczna",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Niewidoczna",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  MENUITEM "Historia",		MNID_OPTS_HISTORY
+  POPUP    "Czcionki"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
-    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Ma³e",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normalne",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Du¿e",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "U¿yj kolorów systemowych",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "Pomo&c" {
    MENUITEM "&Pomoc", MNID_HELP_HELPON
@@ -69,7 +72,7 @@
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Indeks"
@@ -77,8 +80,16 @@
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_BORDER
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Szukaj"
+{
+    LTEXT  "Nie zaimplementowane", -1, 10, 10, 180, 150
+}
+
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE - Pomoc"
 STID_WHERROR, 		"B£¥D"
@@ -92,12 +103,12 @@
 STID_ALL_FILES, 	"Wszystkie pliki (*.*)"
 STID_HELP_FILES_HLP, 	"Pliki pomocy (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Nie znaleziono pliku '%s'. Czy chcesz poszukaæ tego
pliku samodzielnie?"
-STID_NO_RICHEDIT	"Nie uda³o siê znaleŸæ modu³u richedit... Wyœwietlenie pomocy nie
jest mo¿liwe"
-STID_PSH_INDEX,		"Help topics: "
+STID_NO_RICHEDIT	"Nie znaleziono implementacji richedit... Wyœwietlenie pomocy nie
jest mo¿liwe"
+STID_PSH_INDEX,		"Tematy pomocy: "
 }
 
 
-CONTEXT_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN

Modified: trunk/reactos/base/applications/winhlp32/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -80,6 +80,14 @@
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_BORDER
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Поиск"
+{
+    LTEXT  "Не реализовано", -1, 10, 10, 180, 150
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE
 {
@@ -87,7 +95,7 @@
 STID_WHERROR, 		"ОШИБКА"
 STID_WARNING,  		"ВНИМАНИЕ"
 STID_INFO,  		"Информация"
-STID_NOT_IMPLEMENTED, 	"Не реализованно"
+STID_NOT_IMPLEMENTED, 	"Не реализовано"
 STID_HLPFILE_ERROR_s, 	"Ошибка при чтении файла помощи
`%s'"
 STID_INDEX, 		"&Содержание"
 STID_CONTENTS,		"Начало"

Modified: trunk/reactos/base/applications/winhlp32/macro.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -281,24 +281,32 @@
 static void CALLBACK MACRO_CloseSecondarys(void)
 {
     WINHELP_WINDOW *win;
-
-    WINE_TRACE("()\n");
-    for (win = Globals.win_list; win; win = win->next)
+    WINHELP_WINDOW *next;
+
+    WINE_TRACE("()\n");
+    for (win = Globals.win_list; win; win = next)
+    {
+        next = win->next;
         if (lstrcmpi(win->info->name, "main"))
             WINHELP_ReleaseWindow(win);
+    }
 }
 
 static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow)
 {
     WINHELP_WINDOW *win;
+    WINHELP_WINDOW *next;
 
     WINE_TRACE("(\"%s\")\n", lpszWindow);
 
     if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main";
 
-    for (win = Globals.win_list; win; win = win->next)
+    for (win = Globals.win_list; win; win = next)
+    {
+        next = win->next;
         if (!lstrcmpi(win->info->name, lpszWindow))
             WINHELP_ReleaseWindow(win);
+    }
 }
 
 static void CALLBACK MACRO_Compare(LPCSTR str)
@@ -575,13 +583,17 @@
     if ((ptr = strchr(lpszPathWindow, '>')) != NULL)
     {
         LPSTR   tmp;
-        size_t  sz = ptr - lpszPathWindow;
-
-        tmp = HeapAlloc(GetProcessHeap(), 0, sz + 1);
+        size_t  sz;
+
+        tmp = HeapAlloc(GetProcessHeap(), 0, strlen(lpszPathWindow) + 1);
         if (tmp)
         {
-            memcpy(tmp, lpszPathWindow, sz);
-            tmp[sz] = '\0';
+            strcpy(tmp, lpszPathWindow);
+            tmp[ptr - lpszPathWindow] = '\0';
+            ptr += tmp - lpszPathWindow; /* ptr now points to '>' in tmp
buffer */
+            /* in some cases, we have a trailing space that we need to get rid of */
+            /* FIXME: check if it has to be done in lexer rather than here */
+            for (sz = strlen(ptr + 1); sz >= 1 && ptr[sz] == ' ';
sz--) ptr[sz] = '\0';
             MACRO_JumpHash(tmp, ptr + 1, HLPFILE_Hash(topic_id));
             HeapFree(GetProcessHeap(), 0, tmp);
         }

Modified: trunk/reactos/base/applications/winhlp32/winhelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -912,7 +912,10 @@
                 if ((hlpfile = WINHELP_LookupHelpFile(link->string)))
                 {
                     if (link->window == -1)
+                    {
                         wi = win->info;
+                        if (wi->win_style & WS_POPUP) wi =
Globals.active_win->info;
+                    }
                     else if (link->window < hlpfile->numWindows)
                         wi = &hlpfile->windows[link->window];
                     else
@@ -971,9 +974,10 @@
             (HWND)lParam == Globals.active_popup->hMainWnd ||
             GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd)
             break;
+        /* fall through */
     case WM_LBUTTONDOWN:
-        if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam))
-            return FALSE;
+        if (msg == WM_LBUTTONDOWN)
+            WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam);
         /* fall through */
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN:

Modified: trunk/reactos/base/applications/wordpad/Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -105,151 +105,3 @@
         MENUITEM "&Paragraph..."      ID_PARAFORMAT
     END
 END
-
-IDM_COLOR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Black",      ID_COLOR_BLACK
-        MENUITEM "Maroon",     ID_COLOR_MAROON
-        MENUITEM "Green",      ID_COLOR_GREEN
-        MENUITEM "Olive"       ID_COLOR_OLIVE
-        MENUITEM "Navy"        ID_COLOR_NAVY
-        MENUITEM "Purple"      ID_COLOR_PURPLE
-        MENUITEM "Teal"        ID_COLOR_TEAL
-        MENUITEM "Gray"        ID_COLOR_GRAY
-        MENUITEM "Silver"      ID_COLOR_SILVER
-        MENUITEM "Red"         ID_COLOR_RED
-        MENUITEM "Lime"        ID_COLOR_LIME
-        MENUITEM "Yellow"      ID_COLOR_YELLOW
-        MENUITEM "Blue"        ID_COLOR_BLUE
-        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
-        MENUITEM "Aqua"        ID_COLOR_AQUA
-        MENUITEM "White"       ID_COLOR_WHITE
-        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
-    END
-END
-
-IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Date and time"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "Available formats",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
-    PUSHBUTTON   "&OK",IDOK,87,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,87,26,40,12
-END
-
-IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "New"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "New document type",-1,3,2,100,15
-    LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
-    PUSHBUTTON   "&OK",IDOK,97,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,97,26,40,12
-END
-
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Paragraph format"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Indentation", -1, 10, 10, 120, 68
-    LTEXT "Left", -1, 15, 22, 40, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Right", -1, 15, 40, 40, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "First line", -1, 15, 58, 40, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alignment", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-END
-
-IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Tabs"
-FONT 8, "MS SHell DLg"
-BEGIN
-    GROUPBOX "Tab stops", -1, 10, 10, 120, 90
-    COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15
-END
-
-IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
-STYLE DS_SYSMODAL
-Caption ""
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Line wrapping", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45,
117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117,
15
-    GROUPBOX "Toolbars", -1, 150, 10, 120, 85
-    CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
-    LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
-    STRING_TEXT_FILES_TXT,         "Text documents (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
-    STRING_ALL_FILES,              "All documents (*.*)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Left"
-    STRING_ALIGN_RIGHT,           "Right"
-    STRING_ALIGN_CENTER,          "Center"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Text document"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicode text document"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Printer files (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_VIEWPROPS_TITLE,          "Options"
-    STRING_VIEWPROPS_TEXT,           "Text"
-    STRING_VIEWPROPS_RICHTEXT,       "Rich text"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PREVIEW_PRINT,            "Print"
-    STRING_PREVIEW_NEXTPAGE,         "Next page"
-    STRING_PREVIEW_PREVPAGE,         "Previous page"
-    STRING_PREVIEW_TWOPAGES,         "Two pages"
-    STRING_PREVIEW_ONEPAGE,          "One page"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
-    STRING_PREVIEW_CLOSE,            "Close"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END

Modified: trunk/reactos/base/applications/wordpad/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -247,13 +247,6 @@
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Lukk"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE

Modified: trunk/reactos/base/applications/wordpad/Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -2,6 +2,7 @@
  * Portuguese Language File
  *
  * Copyright 2008 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milaré
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,81 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDM_MAINMENU MENU DISCARDABLE
+BEGIN
+    POPUP "&Arquivo"
+    BEGIN
+        MENUITEM "&Novo...\tCtrl+N",       ID_FILE_NEW
+        MENUITEM "&Abrir...\tCtrl+O",      ID_FILE_OPEN
+        MENUITEM "&Salvar\tCtrl+S",        ID_FILE_SAVE
+        MENUITEM "Salvar &como...",        ID_FILE_SAVEAS
+        MENUITEM SEPARATOR
+        MENUITEM "&Imprimir...\tCtrl+P",   ID_PRINT
+        MENUITEM "&Pré visualizar...",     ID_PREVIEW
+        MENUITEM "C&onfigurar página...",  ID_PRINTSETUP
+        MENUITEM SEPARATOR
+        MENUITEM "&Sair",                  ID_FILE_EXIT
+    END
+    POPUP "&Editar"
+    BEGIN
+        MENUITEM "&Desfazer\tCtrl+Z",           ID_EDIT_UNDO
+        MENUITEM "&Refazer\tCtrl+Y",            ID_EDIT_REDO
+        MENUITEM SEPARATOR
+        MENUITEM "Cor&tar\tCtrl+X",             ID_EDIT_CUT
+        MENUITEM "C&opiar\tCtrl+C",             ID_EDIT_COPY
+        MENUITEM "&Colar\tCtrl+V",              ID_EDIT_PASTE
+        MENUITEM "&Limpar\tDEL",                ID_EDIT_CLEAR
+        MENUITEM "&Selecionar tudo\tCtrl+A",    ID_EDIT_SELECTALL
+        MENUITEM SEPARATOR
+        MENUITEM "Locali&zar...\tCtrl+F",       ID_FIND
+        MENUITEM "&Localizar próxima\tF3",      ID_FIND_NEXT
+        MENUITEM "Substitui&r...\tCtrl+H",      ID_REPLACE
+        MENUITEM SEPARATOR
+        MENUITEM "Some&nte leitura",            ID_EDIT_READONLY
+        MENUITEM "&Modificado",                 ID_EDIT_MODIFIED
+        MENUITEM SEPARATOR
+        POPUP "E&xtras"
+        BEGIN
+            MENUITEM "&Informação da selecção",          
ID_EDIT_SELECTIONINFO
+            MENUITEM "&Formato dos caracteres",          
ID_EDIT_CHARFORMAT
+            MENUITEM "&Definir formato dos caracteres",  
ID_EDIT_DEFCHARFORMAT
+            MENUITEM "F&ormato dos parágrafos",          
ID_EDIT_PARAFORMAT
+            MENUITEM "&Buscar texto",                     ID_EDIT_GETTEXT
+        END
+    END
+    POPUP "E&xibir"
+    BEGIN
+        MENUITEM "&Barra de Ferramentas",    ID_TOGGLE_TOOLBAR
+        MENUITEM "Barra de &Formatação",     ID_TOGGLE_FORMATBAR
+        MENUITEM "&Régua",                   ID_TOGGLE_RULER
+        MENUITEM "Barra de &Estado",         ID_TOGGLE_STATUSBAR
+        MENUITEM SEPARATOR
+        MENUITEM "&Opções...",               ID_VIEWPROPERTIES
+    END
+    POPUP "&Inserir"
+    BEGIN
+        MENUITEM "&Data e hora...",  ID_DATETIME
+    END
+    POPUP "F&ormatar"
+    BEGIN
+        MENUITEM "&Fonte...",       ID_FONTSETTINGS
+        MENUITEM "&Marcadores"      ID_BULLET
+        MENUITEM "&Parágrafo..."    ID_PARAFORMAT
+        MENUITEM "T&abulação..."    ID_TABSTOPS
+        POPUP "&Fundo"
+        BEGIN
+            MENUITEM "&Sistema\tCtrl+1",            ID_BACK_1
+            MENUITEM "&PostThat amarelo\tCtrl+2",   ID_BACK_2
+        END
+    END
+    POPUP "&Ajuda"
+    BEGIN
+        MENUITEM "&Sobre Wine Wordpad"       ID_ABOUT
+    END
+END
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 IDM_MAINMENU MENU DISCARDABLE
@@ -97,6 +173,24 @@
     END
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDM_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Cortar",         ID_EDIT_CUT
+        MENUITEM "C&opiar",         ID_EDIT_COPY
+        MENUITEM "Co&lar",          ID_EDIT_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "&Marcadores"      ID_BULLET
+        MENUITEM "&Parágrafo..."    ID_PARAFORMAT
+    END
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDM_POPUP MENU DISCARDABLE
 BEGIN
     POPUP ""
@@ -109,6 +203,9 @@
         MENUITEM "&Parágrafo..."        ID_PARAFORMAT
     END
 END
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 IDM_COLOR_POPUP MENU DISCARDABLE
 BEGIN
@@ -130,7 +227,7 @@
         MENUITEM "Fúcsia"        ID_COLOR_FUCHSIA
         MENUITEM "Azul-piscina"  ID_COLOR_AQUA
         MENUITEM "Branco"        ID_COLOR_WHITE
-        MENUITEM "Automatic"     ID_COLOR_AUTOMATIC
+        MENUITEM "Automático"    ID_COLOR_AUTOMATIC
     END
 END
 
@@ -156,22 +253,22 @@
     PUSHBUTTON   "&Cancelar",IDCANCEL,97,26,40,12
 END
 
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
+IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 220, 110
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 Caption "Parágrafo"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Identação", -1, 10, 10, 120, 68
-    LTEXT "Esquerda", -1, 15, 22, 40, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Direita", -1, 15, 40, 40, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "Primeira Linha", -1, 15, 58, 40, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alinhamento", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancelar", IDCANCEL, 137, 33, 50, 15
+    GROUPBOX "Identação", -1, 10, 10, 140, 68
+    LTEXT "Esquerda", -1, 15, 22, 60, 13
+    EDITTEXT IDC_PARA_LEFT, 75, 20, 60, 13
+    LTEXT "Direita", -1, 15, 40, 60, 13
+    EDITTEXT IDC_PARA_RIGHT, 75, 38, 60, 13
+    LTEXT "Primeira Linha", -1, 15, 58, 60, 13
+    EDITTEXT IDC_PARA_FIRST, 75, 56, 60, 13
+    LTEXT "Alinhamento", -1, 15, 87, 50, 13
+    COMBOBOX IDC_PARA_ALIGN, 65, 85, 70, 60, CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 157, 15, 50, 15
+    PUSHBUTTON "&Cancelar", IDCANCEL, 157, 33, 50, 15
 END
 
 IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
@@ -207,29 +304,49 @@
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
     STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
     STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
     STRING_ALL_FILES,              "Todos os documentos (*.*)"
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_ALL_FILES,              "Todos os documentos (*.*)"
+    STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "Documento rich text"
+    STRING_NEWFILE_TXT,            "Documento de texto"
+    STRING_NEWFILE_TXT_UNICODE,    "Documento de texto Unicode"
+    STRING_PRINTER_FILES_PRN,      "Arquivos de impressora (*.PRN)"
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_ALL_FILES,              "Todos os documentos (*.*)"
+    STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "Documento rich text"
+    STRING_NEWFILE_TXT,            "Documento de texto"
+    STRING_NEWFILE_TXT_UNICODE,    "Documento de texto Unicode"
+    STRING_PRINTER_FILES_PRN,      "Ficheiros de impressora (*.PRN)"
+END
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_ALIGN_LEFT,            "Esquerda"
     STRING_ALIGN_RIGHT,           "Direita"
     STRING_ALIGN_CENTER,          "Centro"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Documento de texto"
-    STRING_NEWFILE_TXT_UNICODE,  "Documento de texto Unicode"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Ficheiros de impressora (*.PRN)"
 END
 
 STRINGTABLE DISCARDABLE
@@ -249,14 +366,37 @@
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Fechar"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END
+    STRING_PREVIEW_PAGE,             "Página"
+    STRING_PREVIEW_PAGES,            "Páginas"
+    STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "inch"
+    STRING_UNITS_PT,                 "pt"
+END
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_DEFAULT_FILENAME,     "Documento"
+    STRING_PROMPT_SAVE_CHANGES,  "Salvar as alterações de '%s'?"
+    STRING_SEARCH_FINISHED,      "Acabou a pesquisa do documento."
+    STRING_LOAD_RICHED_FAILED,   "Falha ao carregar a biblioteca RichEdit."
+    STRING_SAVE_LOSEFORMATTING,  "Foi escolhido salvar em formato de texto simples,
" \
+                                 "o que vai anular todas as formatações. " \
+                                 "Tem a certeza que deseja fazer isto?"
+    STRING_INVALID_NUMBER,       "Formato de número inválido"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE não são suportados"
+    STRING_WRITE_FAILED,              "Não foi possível salvar o arquivo."
+    STRING_WRITE_ACCESS_DENIED,       "Não tem permissões para salvar o
arquivo."
+    STRING_OPEN_FAILED,               "Não foi possível abrir o arquivo."
+    STRING_OPEN_ACCESS_DENIED,        "Não tem permissões para abrir o
arquivo."
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Impressão não implementada"
+    STRING_MAX_TAB_STOPS,             "Não é possível adicionar mais de 32
tabulações."
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE DISCARDABLE
 BEGIN

Modified: trunk/reactos/base/applications/wordpad/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -47,14 +47,14 @@
         MENUITEM "&Копировать\tCtrl+C",         ID_EDIT_COPY
         MENUITEM "&Вставить\tCtrl+V",           ID_EDIT_PASTE
         MENUITEM "&Удалить\tDEL",               ID_EDIT_CLEAR
-        MENUITEM "Выделить в&се\tCtrl+A",      
ID_EDIT_SELECTALL
+        MENUITEM "Выделить в&сё\tCtrl+A",      
ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "&Найти...\tCtrl+F",           ID_FIND
         MENUITEM "На&йти далее\tF3",            ID_FIND_NEXT
         MENUITEM "&Заменить...\tCtrl+H",        ID_REPLACE
         MENUITEM SEPARATOR
         MENUITEM "&Только для чтения",         
ID_EDIT_READONLY
-        MENUITEM "&Изменен",                    ID_EDIT_MODIFIED
+        MENUITEM "&Изменён",                    ID_EDIT_MODIFIED
         MENUITEM SEPARATOR
         POPUP "&Дополнительно"
         BEGIN
@@ -129,7 +129,7 @@
         MENUITEM "Ярко-розовый"   ID_COLOR_FUCHSIA
         MENUITEM "Голубой"        ID_COLOR_AQUA
         MENUITEM "Белый"          ID_COLOR_WHITE
-        MENUITEM "Automatic"      ID_COLOR_AUTOMATIC
+        MENUITEM "Автоматически"      ID_COLOR_AUTOMATIC
     END
 END
 
@@ -193,7 +193,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Перенос по словам", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Не переносить", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "В границах &окна", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "В границах &полей", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Панели", -1, 150, 10, 120, 85
@@ -241,15 +241,15 @@
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_PREVIEW_PRINT,            "Печать"
-    STRING_PREVIEW_NEXTPAGE,         "Следующая страница"
-    STRING_PREVIEW_PREVPAGE,         "Предыдущая страница"
-    STRING_PREVIEW_TWOPAGES,         "Две страницы"
-    STRING_PREVIEW_ONEPAGE,          "Одна страница"
+    STRING_PREVIEW_NEXTPAGE,         "Следующая"
+    STRING_PREVIEW_PREVPAGE,         "Предыдущая"
+    STRING_PREVIEW_TWOPAGES,         "По две"
+    STRING_PREVIEW_ONEPAGE,          "По одной"
     STRING_PREVIEW_ZOOMIN,           "Приблизить"
     STRING_PREVIEW_ZOOMOUT,          "Отдалить"
     STRING_PREVIEW_CLOSE,            "Закрыть"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGE,             "Страница"
+    STRING_PREVIEW_PAGES,            "Страницы"
 END
 
 STRINGTABLE DISCARDABLE
@@ -263,15 +263,15 @@
     STRING_PROMPT_SAVE_CHANGES,  "Сохранить изменения в '%s'?"
     STRING_SEARCH_FINISHED,      "Поиск в документе
завершен."
     STRING_LOAD_RICHED_FAILED,   "Ошибка загрузки библиотеки
RichEdit."
-    STRING_SAVE_LOSEFORMATTING,  "Сохранение документа в виде неформатированного
текста, " \
-                                 "приведет к потере
форматирования. Подтверждаете выполнение" \
+    STRING_SAVE_LOSEFORMATTING,  "Сохранение документа в виде неформатированного
текста " \
+                                 "приведёт к потере
форматирования. Подтверждаете выполнение" \
                                  "этой операции?"
-    STRING_INVALID_NUMBER,       "Неправильный числовой
формат"
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage документы не
поддерживаются"
+    STRING_INVALID_NUMBER,       "Неправильный числовой
формат."
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage документы не
поддерживаются."
     STRING_WRITE_FAILED,              "Невозможно сохранить файл."
     STRING_WRITE_ACCESS_DENIED,       "Недостаточно прав для
сохранения файла."
     STRING_OPEN_FAILED,               "Невозможно открыть
файл."
     STRING_OPEN_ACCESS_DENIED,        "Недостаточно прав для
открытия файла."
-    STRING_PRINTING_NOT_IMPLEMENTED, "Печать не
поддерживается"
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Печать не
поддерживается."
     STRING_MAX_TAB_STOPS,             "Нельзя добавить более 32
позиций табуляции."
 END

Modified: trunk/reactos/base/applications/wordpad/Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -131,127 +131,3 @@
         MENUITEM "Automatic"    ID_COLOR_AUTOMATIC
     END
 END
-
-IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Date and time"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "Available formats",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
-    PUSHBUTTON   "&OK",IDOK,87,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,87,26,40,12
-END
-
-IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "New"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "New document type",-1,3,2,100,15
-    LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
-    PUSHBUTTON   "&OK",IDOK,97,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,97,26,40,12
-END
-
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Paragraph format"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Indentation", -1, 10, 10, 120, 68
-    LTEXT "Left", -1, 15, 22, 40, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Right", -1, 15, 40, 40, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "First line", -1, 15, 58, 40, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alignment", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-END
-
-IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Tabs"
-FONT 8, "MS SHell DLg"
-BEGIN
-    GROUPBOX "Tab stops", -1, 10, 10, 120, 90
-    COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15
-END
-
-IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
-STYLE DS_SYSMODAL
-Caption ""
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Line wrapping", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45,
117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117,
15
-    GROUPBOX "Toolbars", -1, 150, 10, 120, 85
-    CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
-    LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
-    STRING_TEXT_FILES_TXT,         "Text documents (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
-    STRING_ALL_FILES,              "All documents (*.*)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Left"
-    STRING_ALIGN_RIGHT,           "Right"
-    STRING_ALIGN_CENTER,          "Center"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Text document"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicode text document"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Printer files (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_VIEWPROPS_TITLE,          "Options"
-    STRING_VIEWPROPS_TEXT,           "Text"
-    STRING_VIEWPROPS_RICHTEXT,       "Rich text"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PREVIEW_PRINT,            "Print"
-    STRING_PREVIEW_NEXTPAGE,         "Next page"
-    STRING_PREVIEW_PREVPAGE,         "Previous page"
-    STRING_PREVIEW_TWOPAGES,         "Two pages"
-    STRING_PREVIEW_ONEPAGE,          "One page"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
-    STRING_PREVIEW_CLOSE,            "Close"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END

Modified: trunk/reactos/base/applications/wordpad/Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -111,30 +111,6 @@
     END
 END
 
-IDM_COLOR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Black",      ID_COLOR_BLACK
-        MENUITEM "Maroon",     ID_COLOR_MAROON
-        MENUITEM "Green",      ID_COLOR_GREEN
-        MENUITEM "Olive"       ID_COLOR_OLIVE
-        MENUITEM "Navy"        ID_COLOR_NAVY
-        MENUITEM "Purple"      ID_COLOR_PURPLE
-        MENUITEM "Teal"        ID_COLOR_TEAL
-        MENUITEM "Gray"        ID_COLOR_GRAY
-        MENUITEM "Silver"      ID_COLOR_SILVER
-        MENUITEM "Red"         ID_COLOR_RED
-        MENUITEM "Lime"        ID_COLOR_LIME
-        MENUITEM "Yellow"      ID_COLOR_YELLOW
-        MENUITEM "Blue"        ID_COLOR_BLUE
-        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
-        MENUITEM "Aqua"        ID_COLOR_AQUA
-        MENUITEM "White"       ID_COLOR_WHITE
-        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
-    END
-END
-
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "日期和时间"
@@ -250,13 +226,6 @@
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "关闭"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE
@@ -480,11 +449,6 @@
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_UNITS_CM,             "cm"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "儲存改動到 '%s'?"
     STRING_SEARCH_FINISHED,      "檔案查找結束."

Modified: trunk/reactos/base/applications/wordpad/print.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Sat Jun 26 13:56:41 2010
@@ -891,7 +891,7 @@
     EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0);
 }
 
-LRESULT print_preview(HWND hwndPreview)
+static LRESULT print_preview(HWND hwndPreview)
 {
     HDC hdc;
     RECT window, background;
@@ -1039,7 +1039,7 @@
 
 /* Returns the page shown that the point is in (1 or 2) or 0 if the point
  * isn't inside either page */
-int preview_page_hittest(POINT pt)
+static int preview_page_hittest(POINT pt)
 {
     RECT rc;
     rc.left = preview.spacing.cx;

Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -2435,7 +2435,7 @@
         break;
 
     case ID_TABSTOPS:
-        DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd,
tabstops_proc);
+        DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_TABSTOPS), hWnd,
tabstops_proc);
         break;
 
     case ID_ABOUT:
@@ -2546,7 +2546,7 @@
     HWND hwndEditor = preview_isactive() ? GetDlgItem(hWnd, IDC_PREVIEW) :
GetDlgItem(hWnd, IDC_EDITOR);
     HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR);
     HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR);
-    HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER);
+    HWND hRulerWnd = GetDlgItem(hwndReBar, IDC_RULER);
     int rebarHeight = 0;
 
     if (hwndStatusBar)

Modified: trunk/reactos/base/applications/wordpad/wordpad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Sat Jun 26 13:56:41
2010
@@ -247,7 +247,6 @@
 void init_preview(HWND, LPWSTR);
 void close_preview(HWND);
 BOOL preview_isactive(void);
-LRESULT print_preview(HWND);
 void get_default_printer_opts(void);
 void registry_set_pagemargins(HKEY);
 void registry_read_pagemargins(HKEY);