[ros-diffs] [dreimer] 36746: Bug 3750: spanish update for netcfgx by Javier Remacha Bug 3774: Greek update for usetup by Apostulos Alexandris Sync wordpad and Winhlp32 to Wine HEAD.

Author: dreimer
Date: Tue Oct 14 08:47:07 2008
New Revision: 36746
URL: http://svn.reactos.org/svn/reactos?rev=36746&view=rev
Log:
Bug 3750: spanish update for netcfgx by Javier Remacha
Bug 3774: Greek update for usetup by Apostulos Alexandris
Sync wordpad and Winhlp32 to Wine HEAD.
Modified:
    trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc
    trunk/reactos/base/applications/wordpad/Da.rc
    trunk/reactos/base/applications/wordpad/De.rc
    trunk/reactos/base/applications/wordpad/En.rc
    trunk/reactos/base/applications/wordpad/Fr.rc
    trunk/reactos/base/applications/wordpad/Hu.rc
    trunk/reactos/base/applications/wordpad/Ja.rc
    trunk/reactos/base/applications/wordpad/Ko.rc
    trunk/reactos/base/applications/wordpad/Nl.rc
    trunk/reactos/base/applications/wordpad/No.rc
    trunk/reactos/base/applications/wordpad/Pl.rc
    trunk/reactos/base/applications/wordpad/Ru.rc
    trunk/reactos/base/applications/wordpad/Si.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/registry.c
    trunk/reactos/base/applications/wordpad/wordpad.c
    trunk/reactos/base/applications/wordpad/wordpad.h
    trunk/reactos/base/setup/usetup/lang/el-GR.h
    trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc
    trunk/reactos/dll/win32/netshell/lang/es-ES.rc
Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] Tue Oct 14
08:47:07 2008
@@ -19,49 +19,52 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+/* UTF-8 */
+#pragma code_page(65001)
+
 /* Menu */
 MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 {
- POPUP "ƒtƒ@ƒCƒ‹(&F)" {
-  MENUITEM "ŠJ‚­(&O)", MNID_FILE_OPEN
+ POPUP "ファイル(&F)" {
+  MENUITEM "開く(&O)", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "ˆóü(&P)", MNID_FILE_PRINT
-  MENUITEM "ƒvƒŠƒ“ƒ^‚̐ݒè(&S)...", MNID_FILE_SETUP
+  MENUITEM "印刷(&P)", MNID_FILE_PRINT
+  MENUITEM "プリンタの設定(&S)...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "I—¹(&X)", MNID_FILE_EXIT
+  MENUITEM "終了(&X)", MNID_FILE_EXIT
  }
- POPUP "•ÒW(&E)" {
-   MENUITEM "ƒRƒs[(&C)...", MNID_EDIT_COPYDLG
+ POPUP "編集(&E)" {
+   MENUITEM "コピー(&C)...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "ƒRƒƒ“ƒg(&A)...", MNID_EDIT_ANNOTATE
+   MENUITEM "コメント(&A)...", MNID_EDIT_ANNOTATE
  }
- POPUP "‚µ‚¨‚è(&B)" {
-   MENUITEM "’è‹`(&D)...", MNID_BKMK_DEFINE
+ POPUP "しおり(&B)" {
+   MENUITEM "定義(&D)...", MNID_BKMK_DEFINE
  }
- POPUP "ƒIƒvƒVƒ‡ƒ“(&O)" {
+ POPUP "オプション(&O)" {
    POPUP       "Help always visible"
    BEGIN
      MENUITEM "Default",     MNID_OPTS_HELP_DEFAULT
      MENUITEM "Visible",     MNID_OPTS_HELP_VISIBLE
      MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "—š—ð",           MNID_OPTS_HISTORY
-  POPUP    "ƒtƒHƒ“ƒg"
+  MENUITEM "履歴",         MNID_OPTS_HISTORY
+  POPUP    "フォント"
   BEGIN
-    MENUITEM "¬",           MNID_OPTS_FONTS_SMALL
-    MENUITEM "•W€",         MNID_OPTS_FONTS_NORMAL
-    MENUITEM "‘å",           MNID_OPTS_FONTS_LARGE
+    MENUITEM "小",          MNID_OPTS_FONTS_SMALL
+    MENUITEM "標準",       MNID_OPTS_FONTS_NORMAL
+    MENUITEM "大",          MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "ƒVƒXƒeƒ€ ƒJƒ‰[‚ðŽg‚¤",  MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "システム カラーを使う",        MNID_OPTS_SYSTEM_COLORS
  }
- POPUP "ƒwƒ‹ƒv(&H)" {
-   MENUITEM "ƒwƒ‹ƒv‚ɂ‚¢‚Ẵwƒ‹ƒv(&O)", MNID_HELP_HELPON
-   MENUITEM "í‚ÉŽè‘O‚É•\\Ž¦(&T)", MNID_HELP_HELPTOP
+ POPUP "ヘルプ(&H)" {
+   MENUITEM "ヘルプについてのヘルプ(&O)", MNID_HELP_HELPON
+   MENUITEM "常に手前に表示(&T)", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "î•ñ(&I)...", MNID_HELP_ABOUT
+   MENUITEM "情
å ±(&I)...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "WINE ‚ɂ‚¢‚Ä(&A)", MNID_HELP_WINE
+   MENUITEM "WINE について(&A)", MNID_HELP_WINE
 #endif
  }
 }
@@ -69,7 +72,7 @@
 IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 9, "MS Shell Dlg"
-CAPTION "õˆø"
+CAPTION "索引"
 {
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_BORDER
 }
@@ -77,42 +80,42 @@
 IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 9, "MS Shell Dlg"
-CAPTION "ŒŸõ"
+CAPTION "検索"
 {
-    LTEXT  "–¢ŽÀ‘•", -1, 10, 10, 180, 150
+    LTEXT  "未実装
", -1, 10, 10, 180, 150
 }
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 {
-STID_WINE_HELP,        "WINE ƒwƒ‹ƒv"
-STID_WHERROR,          "ƒGƒ‰["
-STID_WARNING,                  "Œx"
-STID_INFO,             "î•ñ"
-STID_NOT_IMPLEMENTED,  "”ñŽÀ‘•"
-STID_HLPFILE_ERROR_s,  "ƒwƒ‹ƒvƒtƒ@ƒCƒ‹ `%s' ‚ð“ǂݍž‚ñ‚Å‚¢‚é‚Æ‚«‚ɃGƒ‰["
-STID_INDEX,            "õˆø(&I)"
-STID_CONTENTS,         "ŠT—v"
-STID_BACK,             "–ß‚é(&B)"
-STID_ALL_FILES,        "‚·‚ׂẴtƒ@ƒCƒ‹ (*.*)"
-STID_HELP_FILES_HLP,   "ƒwƒ‹ƒv ƒtƒ@ƒCƒ‹ (*.hlp)"
-STID_FILE_NOT_FOUND_s  "'%s'
‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBŽ©•ª‚Å‚±‚̃tƒ@ƒCƒ‹‚ð’T‚µ‚Ü‚·‚©?"
-STID_NO_RICHEDIT       "ƒŠƒbƒ`ƒGƒfƒBƒbƒgŽÀ‘•‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ... I—¹‚µ‚Ü‚·"
-STID_PSH_INDEX,                "ƒwƒ‹ƒv ƒgƒsƒbƒN: "
+STID_WINE_HELP,        "WINE ヘルプ"
+STID_WHERROR,          "エラー"
+STID_WARNING,                  "警告"
+STID_INFO,             "情
å ±"
+STID_NOT_IMPLEMENTED,  "非実装
"
+STID_HLPFILE_ERROR_s,  "ヘルプファイル `%s'
を読み込んでいるときにエラー"
+STID_INDEX,            "索引(&I)"
+STID_CONTENTS,         "概要"
+STID_BACK,             "戻る(&B)"
+STID_ALL_FILES,        "すべてのファイル (*.*)"
+STID_HELP_FILES_HLP,   "ヘルプ ファイル (*.hlp)"
+STID_FILE_NOT_FOUND_s  "'%s'
が見つかりません。自分でこのファイルを探しますか?"
+STID_NO_RICHEDIT       "リッチエディット実装
が見つかりません... 終了します"
+STID_PSH_INDEX,                "ヘルプ トピック: "
 }
 CONTEXT_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 BEGIN
        POPUP ""
        BEGIN
-               MENUITEM "ƒRƒƒ“ƒg...",       MNID_CTXT_ANNOTATE
-               MENUITEM "ƒRƒs[",                MNID_CTXT_COPY
-               MENUITEM "ˆóü...",            MNID_CTXT_PRINT
-               POPUP    "ƒtƒHƒ“ƒg"
+               MENUITEM "コメント...",       MNID_CTXT_ANNOTATE
+               MENUITEM "コピー",                MNID_CTXT_COPY
+               MENUITEM "印刷...",            MNID_CTXT_PRINT
+               POPUP    "フォント"
                BEGIN
-                       MENUITEM "¬",       MNID_CTXT_FONTS_SMALL
-                       MENUITEM "•W€",      MNID_CTXT_FONTS_NORMAL
-                       MENUITEM "‘å",       MNID_CTXT_FONTS_LARGE
+                       MENUITEM "小",       MNID_CTXT_FONTS_SMALL
+                       MENUITEM "標準",      MNID_CTXT_FONTS_NORMAL
+                       MENUITEM "大",       MNID_CTXT_FONTS_LARGE
                END
                POPUP   "Help always visible"
                BEGIN
@@ -120,6 +123,8 @@
                        MENUITEM "Visible",     MNID_CTXT_HELP_VISIBLE
                        MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE
                END
-               MENUITEM "ƒVƒXƒeƒ€ ƒJƒ‰[‚ðŽg‚¤",   MNID_CTXT_SYSTEM_COLORS
+               MENUITEM "システム カラーを使う",
MNID_CTXT_SYSTEM_COLORS
        END
 END
+
+#pragma code_page(default)
Modified: trunk/reactos/base/applications/wordpad/Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -164,8 +164,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Liniebrydning", 0, 10, 10, 130, 85
-    RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 45,
117, 15
+    RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Værktøjslinier", 0, 150, 10, 120, 85
     CHECKBOX "&Værktøjslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatteringlinie", IDC_PAGEFMT_FB, 160, 38, 80, 15
Modified: trunk/reactos/base/applications/wordpad/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -166,8 +166,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Zeilenumbruch", 0, 10, 10, 130, 85
-    RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 25, 117, 15
-    RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 45, 117, 15
+    RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Symbolleisten", 0, 150, 10, 120, 85
     CHECKBOX "&Symbolleiste", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatierungsleiste", IDC_PAGEFMT_FB, 160, 38, 80, 15
Modified: trunk/reactos/base/applications/wordpad/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -164,8 +164,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Line wrapping", 0, 10, 10, 130, 85
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    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", 0, 150, 10, 120, 85
     CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
@@ -238,4 +239,5 @@
     STRING_WRITE_ACCESS_DENIED,       "You do not have access to save the
file."
     STRING_OPEN_FAILED,               "Could not open the file."
     STRING_OPEN_ACCESS_DENIED,        "You do not have access to open the
file."
-END
+    STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented"
+END
Modified: trunk/reactos/base/applications/wordpad/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -164,8 +164,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Enveloppement de ligne", 0, 10, 10, 170, 85
-    RADIOBUTTON "Enveloppe le texte à partir de la bordure de fenêtre",
IDC_PAGEFMT_WW, 18, 25, 145, 15
-    RADIOBUTTON "Enveloppe le texte à partir de la &marge", IDC_PAGEFMT_WM,
18, 45, 145, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 145, 15
+    RADIOBUTTON "Enveloppe le texte à partir de la bordure de fenêtre",
IDC_PAGEFMT_WW, 18, 45, 145, 15
+    RADIOBUTTON "Enveloppe le texte à partir de la &marge", IDC_PAGEFMT_WM,
18, 65, 145, 15
     GROUPBOX "Barres d'outils", 0, 170, 10, 120, 85
     CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 180, 20, 80, 15
     CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 180, 38, 80, 15
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] Tue Oct 14 08:47:07 2008
@@ -164,8 +164,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Line wrapping", 0, 10, 10, 130, 85
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    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", 0, 150, 10, 120, 85
     CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
Modified: trunk/reactos/base/applications/wordpad/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -16,40 +16,43 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 IDM_MAINMENU MENU DISCARDABLE
 BEGIN
-    POPUP "ƒtƒ@ƒCƒ‹(&F)"
-    BEGIN
-        MENUITEM "V‹Kì¬(&N)...\tCtrl+N", ID_FILE_NEW
-        MENUITEM "ŠJ‚­(&O)...\tCtrl+O",     ID_FILE_OPEN
-        MENUITEM "ã‘‚«•Û‘¶(&S)\tCtrl+S",  ID_FILE_SAVE
-        MENUITEM "–¼‘O‚ð•t‚¯‚Ä•Û‘¶(&A)...", ID_FILE_SAVEAS
-        MENUITEM SEPARATOR
-        MENUITEM "ˆóü(&P)...\tCtrl+P",     ID_PRINT
-        MENUITEM "ˆóüƒvƒŒƒrƒ…
[(&W)...",   ID_PREVIEW
-        MENUITEM "ƒy[ƒWÝ’è(&E)...",       ID_PRINTSETUP
-        MENUITEM SEPARATOR
-        MENUITEM "I—¹(&X)",                ID_FILE_EXIT
-    END
-    POPUP "•ÒW(&E)"
-    BEGIN
-        MENUITEM "Œ³‚É–ß‚·(&U)\tCtrl+Z",        ID_EDIT_UNDO
-        MENUITEM "‚â‚è’¼‚µ(&E)\tCtrl+Y",        ID_EDIT_REDO
-        MENUITEM SEPARATOR
-        MENUITEM "Ø‚èŽæ‚è(&T)\tCtrl+X",        ID_EDIT_CUT
-        MENUITEM "ƒRƒs[(&C)\tCtrl+C",          ID_EDIT_COPY
-        MENUITEM "“\\‚è•t‚¯(&P)\tCtrl+V",        ID_EDIT_PASTE
-        MENUITEM "ƒNƒŠƒA(&C)\tDEL",             ID_EDIT_CLEAR
-        MENUITEM "‚·‚ׂđI‘ð(&S)\tCtrl+A",      ID_EDIT_SELECTALL
-        MENUITEM SEPARATOR
-        MENUITEM "ŒŸõ(&F)...\tCrtl+F",         ID_FIND
-        MENUITEM "ŽŸ‚ðŒŸõ(&N)\tF3",            ID_FIND_NEXT
-        MENUITEM "’uŠ·(&R)...\tCtrl+H",         ID_REPLACE
-        MENUITEM SEPARATOR
-        MENUITEM "“Ç‚ÝŽæ‚èê—p(&O)",            ID_EDIT_READONLY
-        MENUITEM "•ÏX‚ ‚è(&M)",                ID_EDIT_MODIFIED
+    POPUP "ファイル(&F)"
+    BEGIN
+        MENUITEM "新規作成(&N)...\tCtrl+N", ID_FILE_NEW
+        MENUITEM "開く(&O)...\tCtrl+O",     ID_FILE_OPEN
+        MENUITEM "上書き保存(&S)\tCtrl+S",  ID_FILE_SAVE
+        MENUITEM "名前を付けて保存(&A)...", ID_FILE_SAVEAS
+        MENUITEM SEPARATOR
+        MENUITEM "印刷(&P)...\tCtrl+P",     ID_PRINT
+        MENUITEM "印刷プレビュー(&W)...",   ID_PREVIEW
+        MENUITEM "ページ設定(&E)...",       ID_PRINTSETUP
+        MENUITEM SEPARATOR
+        MENUITEM "終了(&X)",                ID_FILE_EXIT
+    END
+    POPUP "編集(&E)"
+    BEGIN
+        MENUITEM "å…
ƒã«æˆ»ã™(&U)\tCtrl+Z",        ID_EDIT_UNDO
+        MENUITEM "やり直し(&E)\tCtrl+Y",        ID_EDIT_REDO
+        MENUITEM SEPARATOR
+        MENUITEM "切り取り(&T)\tCtrl+X",        ID_EDIT_CUT
+        MENUITEM "コピー(&C)\tCtrl+C",          ID_EDIT_COPY
+        MENUITEM "貼り付け(&P)\tCtrl+V",        ID_EDIT_PASTE
+        MENUITEM "クリア(&C)\tDEL",             ID_EDIT_CLEAR
+        MENUITEM "すべて選択(&S)\tCtrl+A",      ID_EDIT_SELECTALL
+        MENUITEM SEPARATOR
+        MENUITEM "検索(&F)...\tCrtl+F",         ID_FIND
+        MENUITEM "次を検索(&N)\tF3",            ID_FIND_NEXT
+        MENUITEM "置換(&R)...\tCtrl+H",         ID_REPLACE
+        MENUITEM SEPARATOR
+        MENUITEM "読み取り専用(&O)",            ID_EDIT_READONLY
+        MENUITEM "変更あり(&M)",                ID_EDIT_MODIFIED
         MENUITEM SEPARATOR
         POPUP "E&xtras"
         BEGIN
@@ -60,34 +63,34 @@
             MENUITEM "&Get text",               ID_EDIT_GETTEXT
         END
     END
-    POPUP "•\\Ž¦(&V)"
-    BEGIN
-        MENUITEM "ƒc[ƒ‹ƒo[(&T)",              ID_TOGGLE_TOOLBAR
-        MENUITEM "‘Ž®ƒo[(&F)",                ID_TOGGLE_FORMATBAR
-        MENUITEM "ƒ‹[ƒ‰[(&R)",                ID_TOGGLE_RULER
-        MENUITEM "ƒXƒe[ƒ^ƒX ƒo[(&S)",         ID_TOGGLE_STATUSBAR
-        MENUITEM SEPARATOR
-        MENUITEM "ƒIƒvƒVƒ‡ƒ“(&O)...",           ID_VIEWPROPERTIES
-    END
-    POPUP "‘}“ü(&I)"
-    BEGIN
-        MENUITEM "“ú•t‚ÆŽž(&D)...",           ID_DATETIME
-    END
-    POPUP "‘Ž®(&O)"
-    BEGIN
-        MENUITEM "ƒtƒHƒ“ƒg(&F)...",             ID_FONTSETTINGS
-        MENUITEM "‰Óð‘‚«(&B)"                 ID_BULLET
-        MENUITEM "’i—Ž(&P)..."                  ID_PARAFORMAT
-        MENUITEM "ƒ^ƒu(&T)..."                  ID_TABSTOPS
-        POPUP "”wŒi(&D)"
+    POPUP "表示(&V)"
+    BEGIN
+        MENUITEM "ツールバー(&T)",              ID_TOGGLE_TOOLBAR
+        MENUITEM "書式バー(&F)",                ID_TOGGLE_FORMATBAR
+        MENUITEM "ルーラー(&R)",                ID_TOGGLE_RULER
+        MENUITEM "ステータス バー(&S)",         ID_TOGGLE_STATUSBAR
+        MENUITEM SEPARATOR
+        MENUITEM "オプション(&O)...",           ID_VIEWPROPERTIES
+    END
+    POPUP "挿å…
¥(&I)"
+    BEGIN
+        MENUITEM "日付と時刻(&D)...",           ID_DATETIME
+    END
+    POPUP "書式(&O)"
+    BEGIN
+        MENUITEM "フォント(&F)...",             ID_FONTSETTINGS
+        MENUITEM "箇条書き(&B)"                 ID_BULLET
+        MENUITEM "段落(&P)..."                  ID_PARAFORMAT
+        MENUITEM "タブ(&T)..."                  ID_TABSTOPS
+        POPUP "背景(&D)"
         BEGIN
-            MENUITEM "ƒVƒXƒeƒ€(&S)\tCtrl+1",        ID_BACK_1
+            MENUITEM "システム(&S)\tCtrl+1",        ID_BACK_1
             MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2
         END
     END
-    POPUP "ƒwƒ‹ƒv(&H)"
-    BEGIN
-        MENUITEM "Wine Wordpad‚ɂ‚¢‚Ä(&A)"      ID_ABOUT
+    POPUP "ヘルプ(&H)"
+    BEGIN
+        MENUITEM "Wine Wordpadについて(&A)"      ID_ABOUT
     END
 END
@@ -95,67 +98,67 @@
 BEGIN
     POPUP ""
     BEGIN
-        MENUITEM "Ø‚èŽæ‚è(&T)",        ID_EDIT_CUT
-        MENUITEM "ƒRƒs[(&C)",          ID_EDIT_COPY
-        MENUITEM "“\\‚è•t‚¯(&P)",        ID_EDIT_PASTE
-        MENUITEM SEPARATOR
-        MENUITEM "‰Óð‘‚«(&B)"         ID_BULLET
-        MENUITEM "’i—Ž(&P)..."          ID_PARAFORMAT
+        MENUITEM "切り取り(&T)",        ID_EDIT_CUT
+        MENUITEM "コピー(&C)",          ID_EDIT_COPY
+        MENUITEM "貼り付け(&P)",        ID_EDIT_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "箇条書き(&B)"         ID_BULLET
+        MENUITEM "段落(&P)..."          ID_PARAFORMAT
     END
 END
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "“ú•t‚ÆŽž"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    LTEXT        "—˜—p‚Å‚«‚éŒ`Ž®",0,3,2,100,15
+CAPTION "日付と時刻"
+FONT 9, "MS Shell Dlg"
+BEGIN
+    LTEXT        "利用できる形式",0,3,2,100,15
     LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY
     PUSHBUTTON   "&OK",IDOK,87,12,40,12
-    PUSHBUTTON   "ƒLƒƒƒ“ƒZƒ‹(&C)",IDCANCEL,87,26,40,12
+    PUSHBUTTON   "キャンセル(&C)",IDCANCEL,87,26,40,12
 END
 IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "V‹Kì¬"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    LTEXT        "V‚µ‚¢•¶‘Œ`Ž®",0,3,2,100,15
+CAPTION "新規作成"
+FONT 9, "MS Shell Dlg"
+BEGIN
+    LTEXT        "新しい文書形式",0,3,2,100,15
     LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
     PUSHBUTTON   "&OK",IDOK,97,12,40,12
-    PUSHBUTTON   "ƒLƒƒƒ“ƒZƒ‹(&C)",IDCANCEL,97,26,40,12
+    PUSHBUTTON   "キャンセル(&C)",IDCANCEL,97,26,40,12
 END
 IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "’i—Ž‚̐ݒè"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "ƒCƒ“ƒfƒ“ƒg", 0, 10, 10, 120, 68
-    LTEXT "¶(&L)", 0, 15, 22, 40, 13
+CAPTION "段落の設定"
+FONT 9, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "インデント", 0, 10, 10, 120, 68
+    LTEXT "å·¦(&L)", 0, 15, 22, 40, 13
     EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "‰E(&R)", 0, 15, 40, 40, 13
+    LTEXT "右(&R)", 0, 15, 40, 40, 13
     EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "Å‰‚̍s(&F)", 0, 15, 58, 40, 13
+    LTEXT "最初の行(&F)", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "®—ñ(&A)", 0, 15, 87, 40, 13
+    LTEXT "整列(&A)", 0, 15, 87, 40, 13
     COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹(&C)", IDCANCEL, 137, 33, 50, 15
+    PUSHBUTTON "キャンセル(&C)", IDCANCEL, 137, 33, 50, 15
 END
 IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "ƒ^ƒu‚̐ݒè"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "ƒ^ƒu‚Ì’âŽ~ˆÊ’u(&T)", 0, 10, 10, 120, 90
+CAPTION "タブの設定"
+FONT 9, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "タブの停止位置(&T)", 0, 10, 10, 120, 90
     COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON "’ljÁ(&A)", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "íœ(&R)", ID_TAB_DEL, 72, 80, 45, 15
+    DEFPUSHBUTTON "è¿½åŠ (&A)", ID_TAB_ADD, 20, 80, 45, 15
+    PUSHBUTTON "削除(&R)", ID_TAB_DEL, 72, 80, 45, 15
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹(&C)", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "‚·‚ׂč폜(&L)", ID_TAB_EMPTY, 137, 51, 50, 15
+    PUSHBUTTON "キャンセル(&C)", IDCANCEL, 137, 33, 50, 15
+    PUSHBUTTON "すべて削除(&L)", ID_TAB_EMPTY, 137, 51, 50, 15
 END
 IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
@@ -163,59 +166,60 @@
 CAPTION ""
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "s‚̐܂è•Ô‚µ", 0, 10, 10, 130, 85
-    RADIOBUTTON "ƒEƒBƒ“ƒhƒE‚Ì‹«ŠE‚Ő܂è•Ô‚·(&W)", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "ƒ}[ƒWƒ“‚Ő܂è•Ô‚·(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15
-    GROUPBOX "ƒc[ƒ‹ƒo[", 0, 150, 10, 120, 85
-    CHECKBOX "ƒc[ƒ‹ƒo[(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "‘Ž®ƒo[(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "ƒ‹[ƒ‰[(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "ƒXƒe[ƒ^ƒXƒo[(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15
+    GROUPBOX "行の折り返し", 0, 10, 10, 130, 85
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "ウィンドウの境界で折り返す(&W)",
IDC_PAGEFMT_WW, 18, 45, 117, 15
+    RADIOBUTTON "マージンで折り返す(&M)", IDC_PAGEFMT_WM, 18, 65,
117, 15
+    GROUPBOX "ツールバー", 0, 150, 10, 120, 85
+    CHECKBOX "ツールバー(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15
+    CHECKBOX "書式バー(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15
+    CHECKBOX "ルーラー(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15
+    CHECKBOX "ステータスバー(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15
     LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
 END
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "ƒŠƒbƒ`ƒeƒLƒXƒgŒ`Ž® (*.rtf)"
-    STRING_TEXT_FILES_TXT,         "ƒeƒLƒXƒg•¶‘ (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "UnicodeƒeƒLƒXƒg•¶‘(*.txt)"
-    STRING_ALL_FILES,              "‚·‚ׂẴtƒ@ƒCƒ‹ (*.*)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "¶"
-    STRING_ALIGN_RIGHT,           "‰E"
-    STRING_ALIGN_CENTER,          "’†‰›"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "ƒŠƒbƒ`ƒeƒLƒXƒg•¶‘"
-    STRING_NEWFILE_TXT,          "ƒeƒLƒXƒg•¶‘"
-    STRING_NEWFILE_TXT_UNICODE,  "UnicodeƒeƒLƒXƒg•¶‘"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "ƒvƒŠƒ“ƒ^ƒtƒ@ƒCƒ‹ (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_VIEWPROPS_TITLE,          "ƒIƒvƒVƒ‡ƒ“"
-    STRING_VIEWPROPS_TEXT,           "ƒeƒLƒXƒg"
-    STRING_VIEWPROPS_RICHTEXT,       "ƒŠƒbƒ`ƒeƒLƒXƒg"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PREVIEW_PRINT,            "ˆóü"
-    STRING_PREVIEW_NEXTPAGE,         "ŽŸ‚̃y[ƒW"
-    STRING_PREVIEW_PREVPAGE,         "‘O‚̃y[ƒW"
-    STRING_PREVIEW_TWOPAGES,         "2ƒy[ƒW"
-    STRING_PREVIEW_ONEPAGE,          "1ƒy[ƒW"
-    STRING_PREVIEW_CLOSE,            "•Â‚¶‚é"
+    STRING_RICHTEXT_FILES_RTF,     "リッチテキスト形式 (*.rtf)"
+    STRING_TEXT_FILES_TXT,         "テキスト文書 (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Unicodeテキスト文書(*.txt)"
+    STRING_ALL_FILES,              "すべてのファイル (*.*)"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_ALIGN_LEFT,            "å·¦"
+    STRING_ALIGN_RIGHT,           "右"
+    STRING_ALIGN_CENTER,          "中央"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_NEWFILE_RICHTEXT,     "リッチテキスト文書"
+    STRING_NEWFILE_TXT,          "テキスト文書"
+    STRING_NEWFILE_TXT_UNICODE,  "Unicodeテキスト文書"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_PRINTER_FILES_PRN,        "プリンタファイル (*.PRN)"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_VIEWPROPS_TITLE,          "オプション"
+    STRING_VIEWPROPS_TEXT,           "テキスト"
+    STRING_VIEWPROPS_RICHTEXT,       "リッチテキスト"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_PREVIEW_PRINT,            "印刷"
+    STRING_PREVIEW_NEXTPAGE,         "次のページ"
+    STRING_PREVIEW_PREVPAGE,         "前のページ"
+    STRING_PREVIEW_TWOPAGES,         "2ページ"
+    STRING_PREVIEW_ONEPAGE,          "1ページ"
+    STRING_PREVIEW_CLOSE,            "閉じる"
 END
 STRINGTABLE DISCARDABLE
@@ -225,17 +229,19 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_DEFAULT_FILENAME,     "•¶‘"
-    STRING_PROMPT_SAVE_CHANGES,  "'%s'‚ւ̕ύX‚ð•Û‘¶‚µ‚Ü‚·‚©?"
-    STRING_SEARCH_FINISHED,      "•¶‘‚ÌŒŸõ‚ðŠ®—¹B"
-    STRING_LOAD_RICHED_FAILED,   "RichEditƒ‰ƒCƒuƒ‰ƒŠ‚̓ǂݍž‚Ý‚ÉŽ¸”sB"
-    STRING_SAVE_LOSEFORMATTING,  "ƒvƒŒ[ƒ“ƒeƒLƒXƒgŒ`Ž®‚Å•Û‘¶‚·‚é‚ƁA" \
-                                 "‚·‚ׂĂ̏‘Ž®‚ªŽ¸‚í‚ê‚Ü‚·B" \
-                                 "‚»‚ê‚Å‚à‚æ‚¢‚Å‚·‚©H"
-    STRING_INVALID_NUMBER,       "”‚̏‘Ž®‚ª•s³"
-    STRING_OLE_STORAGE_NOT_SUPPORTED,
"OLEƒXƒgƒŒ[ƒW•¶‘‚̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
-    STRING_WRITE_FAILED,              "ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚Å‚«‚Ü‚¹‚ñB"
-    STRING_WRITE_ACCESS_DENIED,       "ƒtƒ@ƒCƒ‹‚É•Û‘¶‚·‚éŒ ŒÀ‚ª‚ ‚è‚Ü‚¹‚ñB"
-    STRING_OPEN_FAILED,               "ƒtƒ@ƒCƒ‹‚ðŠJ‚¯‚Ü‚¹‚ñB"
-    STRING_OPEN_ACCESS_DENIED,        "ƒtƒ@ƒCƒ‹‚ðŠJ‚­Œ ŒÀ‚ª‚ ‚è‚Ü‚¹‚ñB"
-END
+    STRING_DEFAULT_FILENAME,     "文書"
+    STRING_PROMPT_SAVE_CHANGES,
"'%s'への変更を保存しますか?"
+    STRING_SEARCH_FINISHED,      "文書の検索を完了。"
+    STRING_LOAD_RICHED_FAILED,
"RichEditライブラリの読み込みに失敗。"
+    STRING_SAVE_LOSEFORMATTING,
"プレーンテキスト形式で保存すると、" \
+                                 "すべての書式が失われます。" \
+                                 "それでもよいですか？"
+    STRING_INVALID_NUMBER,       "数の書式が不正"
+    STRING_OLE_STORAGE_NOT_SUPPORTED,
"OLEストレージ文書はサポートされていません。"
+    STRING_WRITE_FAILED,              "ファイルを保存できません。"
+    STRING_WRITE_ACCESS_DENIED,
"ファイルに保存する権限がありません。"
+    STRING_OPEN_FAILED,               "ファイルを開けません。"
+    STRING_OPEN_ACCESS_DENIED,
"ファイルを開く権限がありません。"
+END
+
+#pragma code_page(default)
Modified: trunk/reactos/base/applications/wordpad/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -166,8 +166,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "ÁÙ ³Ñ±â±â", 0, 10, 10, 130, 85
-    RADIOBUTTON "â °¡ÀåÀÚ¸®¼­  ±Û ³Ñ±â±â(&W)", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "°¡ÀåÀÚ¸®¿¡¼­ ÁÙ ³Ñ±â±â(&M)", IDC_PAGEFMT_WM, 18, 45, 117,
15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "â °¡ÀåÀÚ¸®¼­  ±Û ³Ñ±â±â(&W)", IDC_PAGEFMT_WW, 18, 45,
117, 15
+    RADIOBUTTON "°¡ÀåÀÚ¸®¿¡¼­ ÁÙ ³Ñ±â±â(&M)", IDC_PAGEFMT_WM, 18, 65, 117,
15
     GROUPBOX " µµ±¸¹Ù", 0, 150, 10, 120, 85
     CHECKBOX "µµ±¸¹Ù(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "Çü½Ä¹Ù(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15
Modified: trunk/reactos/base/applications/wordpad/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -165,8 +165,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Regel afbreken", 0, 10, 10, 130, 85
-    RADIOBUTTON "Breek tekst af bij &venster rand", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "Breek tekst af bij de &marge", IDC_PAGEFMT_WM, 18, 45,
117, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Breek tekst af bij &venster rand", IDC_PAGEFMT_WW, 18, 45,
117, 15
+    RADIOBUTTON "Breek tekst af bij de &marge", IDC_PAGEFMT_WM, 18, 65,
117, 15
     GROUPBOX "Toolbars", 0, 150, 10, 120, 85
     CHECKBOX "&Toolbalk", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formaatbalk", IDC_PAGEFMT_FB, 160, 38, 80, 15
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] Tue Oct 14 08:47:07 2008
@@ -164,8 +164,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Linjebryting", 0, 10, 10, 130, 85
-    RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45,
117, 15
+    RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Verktøylinjer", 0, 150, 10, 120, 85
     CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15
Modified: trunk/reactos/base/applications/wordpad/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -165,8 +165,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Zawijanie wierszy", 0, 10, 10, 130, 85
-    RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 25, 117, 15
-    RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 45, 117, 15
+    RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Paski narzêdzi", 0, 150, 10, 120, 85
     CHECKBOX "Pasek &narzêdzi", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "Pasek &formatu", IDC_PAGEFMT_FB, 160, 38, 80, 15
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] Tue Oct 14 08:47:07 2008
@@ -164,8 +164,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Ïåðåíîñ ïî ñëîâàì", 0, 10, 10, 130, 85
-    RADIOBUTTON "Â ãðàíèöàõ &îêíà", IDC_PAGEFMT_WW, 18, 25, 117, 15
-    RADIOBUTTON "Â ãðàíèöàõ &ïîëåé", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Â ãðàíèöàõ &îêíà", IDC_PAGEFMT_WW, 18, 45, 117, 15
+    RADIOBUTTON "Â ãðàíèöàõ &ïîëåé", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Ïàíåëè", 0, 150, 10, 120, 85
     CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15
@@ -234,4 +235,5 @@
                                  "ýòîé îïåðàöèè?"
     STRING_INVALID_NUMBER,       "Íåïðàâèëüíûé ÷èñëîâîé ôîðìàò"
     STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage äîêóìåíòû íå ïîääåðæèâàþòñÿ"
-END
+    STRING_PRINTING_NOT_IMPLEMENTED, "Ïå÷àòü íå ïîääåðæèâàåòñÿ"
+END
Modified: trunk/reactos/base/applications/wordpad/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -166,8 +166,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Prelom vrstic", 0, 10, 10, 130, 85
-    RADIOBUTTON "Prelomi besedilo na robu o&kna", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "Prelomi besedilo na robu &papirja", IDC_PAGEFMT_WM, 18,
45, 117, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Prelomi besedilo na robu o&kna", IDC_PAGEFMT_WW, 18, 45,
117, 15
+    RADIOBUTTON "Prelomi besedilo na robu &papirja", IDC_PAGEFMT_WM, 18,
65, 117, 15
     GROUPBOX "Orodne vrstice", 0, 150, 10, 120, 85
     CHECKBOX "O&rodna vrstica", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "O&blikovna vrstica", IDC_PAGEFMT_FB, 160, 38, 80, 15
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] Tue Oct 14 08:47:07 2008
@@ -166,8 +166,9 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Line wrapping", 0, 10, 10, 130, 85
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25,
117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    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", 0, 150, 10, 120, 85
     CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
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] Tue Oct 14 08:47:07 2008
@@ -169,8 +169,9 @@
 FONT 9, "MS Song"
 BEGIN
     GROUPBOX "自动换行", 0, 10, 10, 130, 85
-    RADIOBUTTON "按视窗宽度(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15
-    RADIOBUTTON "æŒ‰çº¸å¼ å®½åº¦(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "按视窗宽度(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15
+    RADIOBUTTON "æŒ‰çº¸å¼ å®½åº¦(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "å·¥å…
·æ ", 0, 150, 10, 120, 85
     CHECKBOX "å·¥å…
·æ (&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "æ ¼å¼å·¥å…
·æ (&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15
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] Tue Oct 14 08:47:07 2008
@@ -132,24 +132,22 @@
 static LONG twips_to_centmm(int twips)
 {
-    return MulDiv(twips, 1000, TWIPS_PER_CM);
-}
-
-LONG centmm_to_twips(int mm)
-{
-    return MulDiv(mm, TWIPS_PER_CM, 1000);
+    return MulDiv(twips, CENTMM_PER_INCH, TWIPS_PER_INCH);
+}
+
+static LONG centmm_to_twips(int mm)
+{
+    return MulDiv(mm, TWIPS_PER_INCH, CENTMM_PER_INCH);
 }
 static LONG twips_to_pixels(int twips, int dpi)
 {
-    float ret = ((float)twips / ((float)TWIPS_PER_CM * 2.54)) * (float)dpi;
-    return (LONG)ret;
+    return MulDiv(twips, dpi, TWIPS_PER_INCH);
 }
 static LONG devunits_to_twips(int units, int dpi)
 {
-    float ret = ((float)units / (float)dpi) * (float)TWIPS_PER_CM * 2.54;
-    return (LONG)ret;
+    return MulDiv(units, TWIPS_PER_INCH, dpi);
 }
@@ -181,25 +179,35 @@
 void target_device(HWND hMainWnd, DWORD wordWrap)
 {
     HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR);
-    HDC hdc = make_dc();
-    int width = 0;
     if(wordWrap == ID_WORDWRAP_MARGIN)
     {
+        int width = 0;
+        LRESULT result;
+        HDC hdc = make_dc();
         RECT rc = get_print_rect(hdc);
+
         width = rc.right - rc.left;
-    }
-
-    if(!hdc)
-    {
-        HDC hMaindc = GetDC(hMainWnd);
-        hdc = CreateCompatibleDC(hMaindc);
-        ReleaseDC(hMainWnd, hMaindc);
-    }
-
-    SendMessageW(hEditorWnd, EM_SETTARGETDEVICE, (WPARAM)hdc, width);
-
-    DeleteDC(hdc);
+        if(!hdc)
+        {
+            HDC hMaindc = GetDC(hMainWnd);
+            hdc = CreateCompatibleDC(hMaindc);
+            ReleaseDC(hMainWnd, hMaindc);
+        }
+        result = SendMessageW(hEditorWnd, EM_SETTARGETDEVICE, (WPARAM)hdc, width);
+        DeleteDC(hdc);
+        if (result)
+            return;
+        /* otherwise EM_SETTARGETDEVICE failed, so fall back on wrapping
+         * to window using the NULL DC. */
+    }
+
+    if (wordWrap != ID_WORDWRAP_NONE) {
+        SendMessageW(hEditorWnd, EM_SETTARGETDEVICE, 0, 0);
+    } else {
+        SendMessageW(hEditorWnd, EM_SETTARGETDEVICE, 0, 1);
+    }
+
 }
 static LPWSTR dialog_print_to_file(HWND hMainWnd)
@@ -502,7 +510,7 @@
         hdc = CreateCompatibleDC(0);
-        CmPixels = twips_to_pixels(TWIPS_PER_CM, GetDeviceCaps(hdc, LOGPIXELSX));
+        CmPixels = twips_to_pixels(centmm_to_twips(1000), GetDeviceCaps(hdc,
LOGPIXELSX));
         QuarterCmPixels = (int)((float)CmPixels / 4.0);
         hBitmap = CreateCompatibleBitmap(hdc, drawRect->right, drawRect->bottom);
@@ -620,7 +628,7 @@
     return 0;
 }
-void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int
bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight)
+static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int
bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight)
 {
     HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight);
     HPEN hPen;
@@ -800,7 +808,7 @@
     return 0;
 }
-void update_preview(HWND hWnd)
+static void update_preview(HWND hWnd)
 {
     RECT rc;
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 [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] Tue Oct 14 08:47:07
2008
@@ -81,7 +81,7 @@
     HKEY hKey;
     DWORD action;
-    if(registry_get_handle(&hKey, &action, (LPWSTR)key_options) == ERROR_SUCCESS)
+    if(registry_get_handle(&hKey, &action, key_options) == ERROR_SUCCESS)
     {
         WINDOWPLACEMENT wp;
         DWORD isMaximized;
@@ -104,7 +104,7 @@
     HKEY hKey;
     DWORD size = sizeof(RECT);
-    if(registry_get_handle(&hKey, 0, (LPWSTR)key_options) != ERROR_SUCCESS ||
+    if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS ||
        RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)rc, &size) !=
        ERROR_SUCCESS || size != sizeof(RECT))
     {
@@ -122,7 +122,7 @@
     HKEY hKey;
     DWORD size = sizeof(DWORD);
-    if(registry_get_handle(&hKey, 0, (LPWSTR)key_options) != ERROR_SUCCESS ||
+    if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS ||
        RegQueryValueExW(hKey, var_maximized, 0, NULL, (LPBYTE)bMaximized, &size) !=
        ERROR_SUCCESS || size != sizeof(DWORD))
     {
@@ -314,7 +314,7 @@
             for(i = 0; pFiles[i] && i < FILELIST_ENTRIES; i++)
             {
                 wsprintfW(buffer, var_file, i+1);
-                RegSetValueExW(hKey, (LPWSTR)&buffer, 0, REG_SZ, (LPBYTE)pFiles[i],
+                RegSetValueExW(hKey, (LPWSTR)&buffer, 0, REG_SZ, (const
BYTE*)pFiles[i],
                                (lstrlenW(pFiles[i])+1)*sizeof(WCHAR));
             }
         }
@@ -366,7 +366,7 @@
     if(index == reg_formatindex(SF_RTF))
         wordWrap[index] = ID_WORDWRAP_WINDOW;
     else if(index == reg_formatindex(SF_TEXT))
-        wordWrap[index] = ID_WORDWRAP_WINDOW; /* FIXME: should be ID_WORDWRAP_NONE once
we support it */
+        wordWrap[index] = ID_WORDWRAP_NONE;
     RegCloseKey(hKey);
 }
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] Tue Oct 14 08:47:07
2008
@@ -36,6 +36,7 @@
 #include <math.h>
 #include <errno.h>
+#include "wine/unicode.h"
 #include "wordpad.h"
 #ifdef NONAMELESSUNION
@@ -49,11 +50,10 @@
 #endif
 /* use LoadString */
-static const WCHAR xszAppTitle[] = {'W','i','n','e','
','W','o','r','d','p','a','d',0};
+static const WCHAR wszAppTitle[] = {'W','i','n','e','
','W','o','r','d','p','a','d',0};
 static const WCHAR wszRichEditClass[] =
{'R','I','C','H','E','D','I','T','2','0','W',0};
 static const WCHAR wszMainWndClass[] =
{'W','O','R','D','P','A','D','T','O','P',0};
-static const WCHAR wszAppTitle[] = {'W','i','n','e','
','W','o','r','d','p','a','d',0};
 static const WCHAR stringFormat[] = {'%','2','d','\0'};
@@ -317,7 +317,7 @@
     HDC hdc = GetDC(hMainWnd);
     static const unsigned choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72};
     WCHAR buffer[3];
-    int i;
+    size_t i;
     DWORD fontStyle;
     ZeroMemory(&fmt, sizeof(fmt));
@@ -440,7 +440,7 @@
     populate_size_list(hSizeListWnd);
-    SendMessageW(hFontListEditWnd, WM_SETTEXT, 0, (LPARAM)(LPWSTR)wszFaceName);
+    SendMessageW(hFontListEditWnd, WM_SETTEXT, 0, (LPARAM)wszFaceName);
 }
 static void set_default_font(void)
@@ -478,7 +478,7 @@
         set_font((LPCWSTR) wszNewFaceName);
 }
-static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, NEWTEXTMETRICEXW
*ntmc)
+static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, const
NEWTEXTMETRICEXW *ntmc)
 {
     COMBOBOXEXITEMW cbItem;
     WCHAR buffer[MAX_PATH];
@@ -557,7 +557,7 @@
 }
-int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lpntme,
+static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lpntme,
                             DWORD FontType, LPARAM lParam)
 {
     HWND hListWnd = (HWND) lParam;
@@ -565,7 +565,7 @@
     if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) ==
CB_ERR)
     {
-        add_font((LPWSTR)lpelfe->lfFaceName, FontType, hListWnd,
(NEWTEXTMETRICEXW*)lpntme);
+        add_font(lpelfe->lfFaceName, FontType, hListWnd, (const
NEWTEXTMETRICEXW*)lpntme);
     }
     return 1;
@@ -810,7 +810,10 @@
         WriteFile(hFile, &unicode, sizeof(unicode), &writeOut, 0);
         if(writeOut != sizeof(unicode))
+        {
+            CloseHandle(hFile);
             return;
+        }
     }
     stream.dwCookie = (DWORD_PTR)hFile;
@@ -977,13 +980,15 @@
                 sprintf(id, "%d\n", (int)ps->lParam);
                 SetWindowTextA(hIdWnd, id);
-                if(wordWrap[ps->lParam] == ID_WORDWRAP_WINDOW)
+                if(wordWrap[ps->lParam] == ID_WORDWRAP_NONE)
+                    wrap = IDC_PAGEFMT_WN;
+                else if(wordWrap[ps->lParam] == ID_WORDWRAP_WINDOW)
                     wrap = IDC_PAGEFMT_WW;
                 else if(wordWrap[ps->lParam] == ID_WORDWRAP_MARGIN)
                     wrap = IDC_PAGEFMT_WM;
                 if(wrap != -1)
-                    CheckRadioButton(hWnd, IDC_PAGEFMT_WW,
+                    CheckRadioButton(hWnd, IDC_PAGEFMT_WN,
                                      IDC_PAGEFMT_WM, wrap);
                 if(barState[ps->lParam] & (1 << BANDID_TOOLBAR))
@@ -1000,9 +1005,10 @@
         case WM_COMMAND:
             switch(LOWORD(wParam))
             {
+                case IDC_PAGEFMT_WN:
                 case IDC_PAGEFMT_WW:
                 case IDC_PAGEFMT_WM:
-                    CheckRadioButton(hWnd, IDC_PAGEFMT_WW, IDC_PAGEFMT_WM,
+                    CheckRadioButton(hWnd, IDC_PAGEFMT_WN, IDC_PAGEFMT_WM,
                                      LOWORD(wParam));
                     break;
@@ -1026,7 +1032,9 @@
                     GetWindowTextA(hIdWnd, sid, 4);
                     id = atoi(sid);
-                    if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_WW))
+                    if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_WN))
+                        wordWrap[id] = ID_WORDWRAP_NONE;
+                    else if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_WW))
                         wordWrap[id] = ID_WORDWRAP_WINDOW;
                     else if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_WM))
                         wordWrap[id] = ID_WORDWRAP_MARGIN;
@@ -1061,7 +1069,7 @@
 {
     PROPSHEETPAGEW psp[2];
     PROPSHEETHEADERW psh;
-    int i;
+    size_t i;
     HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE);
     LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)&psp;
@@ -1153,7 +1161,7 @@
     }
     if (opt_print)
-        MessageBox(hMainWnd, "Printing not implemented", "WordPad",
MB_OK);
+        MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED),
wszAppTitle, MB_OK);
 }
 static LRESULT handle_findmsg(LPFINDREPLACEW pFr)
@@ -1271,7 +1279,7 @@
 static int current_units_to_twips(float number)
 {
-    int twips = (int)(number * TWIPS_PER_CM);
+    int twips = (int)(number * 1000.0 / (float)CENTMM_PER_INCH *  (float)TWIPS_PER_INCH);
     return twips;
 }
@@ -1284,22 +1292,19 @@
 static void number_with_units(LPWSTR buffer, int number)
 {
-    float converted = (float)number / TWIPS_PER_CM;
-    char string[MAX_STRING_LEN];
-
-    sprintf(string, "%.2f ", converted);
-    lstrcatA(string, units_cmA);
-    MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN);
+    static const WCHAR fmt[] = {'%','.','2','f','
','%','s','\0'};
+    float converted = (float)number / (float)TWIPS_PER_INCH *(float)CENTMM_PER_INCH /
1000.0;
+
+    wsprintfW(buffer, fmt, converted, units_cmW);
 }
 static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength)
 {
-    HANDLE hHeap;
-    COMBOBOXEXITEM cbItem;
+    COMBOBOXEXITEMW cbItem;
     COMBOBOXINFO cbInfo;
     HWND hCombo, hList;
     int idx, result;
-    char *szBuffer;
+
     hCombo = (HWND)SendMessage(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0);
     if (!hCombo)
         return FALSE;
@@ -1312,22 +1317,13 @@
     if (idx < 0)
         return FALSE;
-    hHeap = GetProcessHeap();
-    szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, bufferLength);
     ZeroMemory(&cbItem, sizeof(cbItem));
     cbItem.mask = CBEIF_TEXT;
     cbItem.iItem = idx;
-    cbItem.pszText = szBuffer;
+    cbItem.pszText = wszBuffer;
     cbItem.cchTextMax = bufferLength-1;
-    result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem);
-    if (!result)
-    {
-        HeapFree(hHeap, 0, szBuffer);
-        return FALSE;
-    }
-
-    result = MultiByteToWideChar(CP_ACP, 0, szBuffer, -1, wszBuffer, bufferLength);
-    HeapFree(hHeap, 0, szBuffer);
+    result = SendMessageW(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem);
+
     return result != 0;
 }
@@ -1828,7 +1824,7 @@
     hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL,
       WS_CHILD|WS_VISIBLE|ES_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL
-      |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL,
+      |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL|WS_HSCROLL,
       0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL);
     if (!hEditorWnd)
@@ -1946,8 +1942,8 @@
         sprintf( buf,"selection = %d..%d, line count=%ld",
                  pSC->chrg.cpMin, pSC->chrg.cpMax,
-        SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0));
-        SetWindowText(GetDlgItem(hWnd, IDC_STATUSBAR), buf);
+                SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0));
+        SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf);
         SendMessage(hWnd, WM_USER, 0, 0);
         return 1;
     }
@@ -2136,7 +2132,7 @@
         TEXTRANGEW tr;
         GetWindowTextW(hwndEditor, data, nLen+1);
-        MessageBoxW(NULL, data, xszAppTitle, MB_OK);
+        MessageBoxW(NULL, data, wszAppTitle, MB_OK);
         HeapFree( GetProcessHeap(), 0, data);
         data = HeapAlloc(GetProcessHeap(), 0, (nLen+1)*sizeof(WCHAR));
@@ -2144,7 +2140,7 @@
         tr.chrg.cpMax = nLen;
         tr.lpstrText = data;
         SendMessage (hwndEditor, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
-        MessageBoxW(NULL, data, xszAppTitle, MB_OK);
+        MessageBoxW(NULL, data, wszAppTitle, MB_OK);
         HeapFree( GetProcessHeap(), 0, data );
         /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */
@@ -2184,7 +2180,7 @@
         SendMessage(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data);
         sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax);
         MessageBoxA(hWnd, buf, "Editor", MB_OK);
-        MessageBoxW(hWnd, data, xszAppTitle, MB_OK);
+        MessageBoxW(hWnd, data, wszAppTitle, MB_OK);
         HeapFree( GetProcessHeap(), 0, data);
         /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */
         return 0;
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] Tue Oct 14 08:47:07
2008
@@ -19,7 +19,8 @@
 #define MAX_STRING_LEN 255
-#define TWIPS_PER_CM 567
+#define TWIPS_PER_INCH 1440
+#define CENTMM_PER_INCH 2540
 #define ID_FILE_EXIT 1000
 #define ID_FILE_OPEN 1001
@@ -113,9 +114,10 @@
 #define IDC_PAGEFMT_FB 101
 #define IDC_PAGEFMT_RU 102
 #define IDC_PAGEFMT_SB 103
-#define IDC_PAGEFMT_WW 104
-#define IDC_PAGEFMT_WM 105
-#define IDC_PAGEFMT_ID 106
+#define IDC_PAGEFMT_WN 104
+#define IDC_PAGEFMT_WW 105
+#define IDC_PAGEFMT_WM 106
+#define IDC_PAGEFMT_ID 107
 #define ID_DATETIME 1600
 #define ID_PARAFORMAT 1601
@@ -197,6 +199,7 @@
 #define STRING_WRITE_ACCESS_DENIED 1708
 #define STRING_OPEN_FAILED 1709
 #define STRING_OPEN_ACCESS_DENIED 1710
+#define STRING_PRINTING_NOT_IMPLEMENTED 1711
 LPWSTR file_basename(LPWSTR);
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -343,7 +343,7 @@
     {
         0,
         0,
-        "   ENTER = Return",
+        "   ENTER = „§ ©«¨¦­ã",
         TEXT_TYPE_STATUS
     },
     {
@@ -545,7 +545,7 @@
     {
         8,
         14,
-        "\x07  ˜«ã©«œ «¦ §¢ã¡«¨¦ ESC š ˜ ¤˜ œ§ ©«¨â¯œ«œ ©«ž¤ §¦¨žš¦ç£œ¤ž",
+        "\x07  ˜«ã©«œ «¦ §¢ã¡«¨¦ ESC š ˜ ¤˜ œ§ ©«¨â¯œ«œ ©«ž¤ §¨¦žš¦ç£œ¤ž",
         TEXT_STYLE_NORMAL
     },
     {
@@ -597,7 +597,7 @@
     {
         0,
         0,
-        "   „¡¡˜Ÿá¨ž©ž §¨¦©à¨ ¤é¤ ˜¨®œåà¤...",
+        "   „¡¡˜Ÿá¨ ©ž §¨¦©à¨ ¤é¤ ˜¨®œåà¤...",
         TEXT_TYPE_STATUS
     },
     {
@@ -826,7 +826,7 @@
     {
         8,
         11,
-        "\x07  ˜«ã©«œ €Œ— 㠉€’— š ˜ ¤˜ œ§ ¢â¥œ«œ ⤘ ©«¦ ®â ¦ «žª ¢å©«˜ª.",
+        "\x07  ˜«ã©«œ €Œ— 㠉€’— š ˜ ¤˜ œ§ ¢â¥œ«œ ⤘ ©«¦ ®œå¦ «žª ¢å©«˜ª.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -912,7 +912,7 @@
     {
         6,
         8,
-        "† œš¡˜«á©«˜©ž ˜¤« š¨á­œ  «˜ ˜¨®å˜ «¦¬ ReactOS ©«¦ œ§ ¢œš£â¤¦
› ˜£â¨ ©£˜.",
+        "† œš¡˜«á©«˜©ž ˜¤« š¨á­œ  «˜ ˜¨®œå˜ «¦¬ ReactOS ©«¦ œ§ ¢œš£â¤¦
› ˜£â¨ ©£˜.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -930,7 +930,7 @@
     {
         6,
         15,
-        "› ˜š¨á¯œ«œ ®˜¨˜¡«ã¨œª ¡˜  £œ«á §¢ž¡«¨¦¢¦šå©«œ «¦¤ ­á¡œ¢¦ ©«¦¤ ¦§¦å¦",
+        "› ˜š¨á¯œ«œ ®˜¨˜¡«ã¨œª ¡˜  £œ«á §¢ž¡«¨¦¢¦šœå©«œ «¦¤ ­á¡œ¢¦ ©«¦¤ ¦§¦å¦",
         TEXT_STYLE_NORMAL
     },
     {
@@ -970,7 +970,7 @@
     {
         0,
         13,
-        "«˜ ˜¨®œå˜ ©«¦¤ ­á¡œ¢¦ œš¡˜«á©«˜©žª",
+        "«˜ ˜¨®œå˜ ©«¦ ­á¡œ¢¦ œš¡˜«á©«˜©žª",
         TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
     },
     {
@@ -1074,7 +1074,7 @@
     {
         8,
         14,
-        "\x07  ˜«ã©«œ «¦ §¢ã¡«¨¦ ESC š ˜ ¤˜ œ§ ©«¨â¯œ«œ ©«ž¤ §¦¨žš¦ç£œ¤ž",
+        "\x07  ˜«ã©«œ «¦ §¢ã¡«¨¦ ESC š ˜ ¤˜ œ§ ©«¨â¯œ«œ ©«ž¤ §¨¦žš¦ç£œ¤ž",
         TEXT_STYLE_NORMAL
     },
     {
@@ -1108,7 +1108,7 @@
     {
         6,
         8,
-        "Please select a layout to be installed by default.",
+        "˜¨˜¡˜¢é œ§ ¢â¥«œ £ ˜ › ᫘¥ž š ˜ ¤˜ œš¡˜«˜©«˜Ÿœå ઠ§¨¦œ§ ¢œš£â¤ž.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -1126,7 +1126,7 @@
     {
         8,
         13,
-        "\x07  ˜«ã©«œ «¦ §¢ã¡«¨¦ ESC š ˜ ¤˜ œ§ ©«¨â¯œ«œ ©«ž¤ §¦¨žš¦ç£œ¤ž",
+        "\x07  ˜«ã©«œ «¦ §¢ã¡«¨¦ ESC š ˜ ¤˜ œ§ ©«¨â¯œ«œ ©«ž¤ §¨¦žš¦ç£œ¤ž",
         TEXT_STYLE_NORMAL
     },
     {
@@ -1261,7 +1261,7 @@
     {
         0,
         0,
-        "   D = ƒ˜ š¨˜­ã Partition   ESC = €¡ç¨à©ž   F3 = €§¦®é¨ž©ž",
+        "   D = ƒ ˜š¨˜­ã Partition   ESC = €¡ç¨à©ž   F3 = €§¦®é¨ž©ž",
         TEXT_TYPE_STATUS
     },
     {
@@ -1421,7 +1421,7 @@
     },
     {
         //ERROR_FIND_REGISTRY
-        "† œš¡˜«á©˜©ž ˜§â«¬®˜ ¤˜ ™¨œ  «˜ ˜¨®œå˜ ›œ›¦£â¤à¤ «¦¬ £ž«¨é¦¬.",
+        "† œš¡˜«á©˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «˜ ˜¨®œå˜ ›œ›¦£â¤à¤ «¦¬ £ž«¨é¦¬.",
         "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"
     },
     {
@@ -1431,7 +1431,7 @@
     },
     {
         //ERROR_INITIALIZE_REGISTRY,
-        "Setup failed to set the initialize the registry.",
+        "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ˜¨® ¡¦§¦ 㩜  «¦ £ž«¨é¦.",
         "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"
     },
     {
@@ -1499,7 +1499,7 @@
     },
     {
         //ERROR_ADDING_KBLAYOUTS,
-        "† œš¡˜«á©¬˜©ž ˜§â«¬®œ ¤˜ §¨¦©Ÿâ©œ  « ª › ˜«á¥œ ª §¢ž¡«¨¦¢¦šåठ©«¦
£ž«¨é¦.\n"
+        "† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ §¨¦©Ÿâ©œ  « ª › ˜«á¥œ ª §¢ž¡«¨¦¢¦šåठ©«¦
£ž«¨é¦.\n"
         "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"
     },
     {
@@ -1612,73 +1612,73 @@
 MUI_STRING elGRStrings[] =
 {
     {STRING_PLEASEWAIT,
-     "   Please wait..."},
+     "   ˜¨˜¡˜¢é §œ¨ £â¤œ«œ..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   C = Create Partition   F3 = Quit"},
+     "   ENTER = „š¡˜«á©«˜©ž   C = ƒž£ ¦¬¨šå˜ Partition   F3 = €§¦®é¨ž©ž"},
     {STRING_INSTALLDELETEPARTITION,
-     "   ENTER = Install   D = Delete Partition   F3 = Quit"},
+     "   ENTER = „š¡˜«á©«˜©ž   D = ƒ ˜š¨˜­ã Partition   F3 = €§¦®é¨ž©ž"},
     {STRING_PARTITIONSIZE,
-     "Size of new partition:"},
+     "‹âšœŸ¦ª «¦¬ ¤â¦¬ partition:"},
     {STRING_CHOOSENEWPARTITION,
-     "You have chosen to create a new partition on"},
+     "„§ ¢â¥˜«œ ¤˜ ›ž£ ¦¬¨šã©œ«œ ⤘ ¤â¦ partition on"},
     {STRING_HDDSIZE,
-    "Please enter the size of the new partition in megabytes."},
+    "˜¨˜¡˜¢é ›é©«œ «¦ £âšœŸ¦ª «¦¬ partition ©œ megabytes."},
     {STRING_CREATEPARTITION,
-     "   ENTER = Create Partition   ESC = Cancel   F3 = Quit"},
+     "   ENTER = ƒž£ ¦¬¨šå˜ Partition   ESC = €¡ç¨à©ž   F3 = €§¦®é¨ž©ž"},
     {STRING_PARTFORMAT,
-    "This Partition will be formatted next."},
+    "€¬«æ «¦ Partition Ÿ˜ › ˜£¦¨­àŸœå £œ«á."},
     {STRING_NONFORMATTEDPART,
-    "You chose to install ReactOS on a new or unformatted Partition."},
+    "„§ ¢â¥˜«œ ¤˜ œš¡˜«˜©«ã©œ«œ «¦ ReactOS ©œ ⤘ ¤â¦ ã £ž › ˜£¦¨­à£â¤¦
Partition."},
     {STRING_INSTALLONPART,
     "Setup install ReactOS onto Partition"},
     {STRING_CHECKINGPART,
-    "Setup is now checking the selected partition."},
+    "† œš¡˜«á©«˜©ž œ¢âš®œ  «é¨˜ «¦ œ§ ¢œš£â¤¦ partition."},
     {STRING_QUITCONTINUE,
-    "F3= Quit  ENTER = Continue"},
+    "F3= €§¦®é¨ž©ž  ENTER = ‘¬¤â®œ ˜"},
     {STRING_REBOOTCOMPUTER,
-    "ENTER = Reboot computer"},
+    "ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"},
     {STRING_TXTSETUPFAILED,
     "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
     {STRING_COPYING,
-     "\xB3 Copying file: %S"},
+     "\xB3 €¤« š¨á­œ«˜  «¦ ˜¨®œå¦: %S"},
     {STRING_SETUPCOPYINGFILES,
-     "Setup is copying files..."},
+     "† œš¡˜«á©«˜©ž ˜¤« š¨á­œ  ˜¨®œå˜..."},
     {STRING_REGHIVEUPDATE,
-    "   Updating registry hives..."},
+    "   ‚夜«˜  ˜¤˜¤âਫ਼ «à¤ registry hives..."},
     {STRING_IMPORTFILE,
-    "   Importing %S..."},
+    "   ‚夜«˜  œ ©˜šàšã «¦¬ %S..."},
     {STRING_DISPLAYETTINGSUPDATE,
-    "   Updating display registry settings..."},
+    "   ‚夜«˜  ˜¤˜¤âਫ਼ «à¤ ¨¬Ÿ£å©œà¤ œ£­á¤ ©žª «¦¬ £ž«¨é¦¬..."},
     {STRING_LOCALESETTINGSUPDATE,
-    "   Updating locale settings..."},
+    "   ‚夜«˜  ˜¤˜¤âਫ਼ «à¤ ¨¬Ÿ£å©œà¤ š¢é©©˜ª..."},
     {STRING_KEYBOARDSETTINGSUPDATE,
-    "   Updating keyboard layout settings..."},
+    "   ‚夜«˜  ˜¤˜¤âਫ਼ «à¤ ¨¬Ÿ£å©œà¤ › ᫘¥žª §¢ž¡«¨¦¢¦šå¦¬..."},
     {STRING_CODEPAGEINFOUPDATE,
     "   Adding codepage information to registry..."},
     {STRING_DONE,
-    "   Done..."},
+    "   Ž¢¦¡¢ž¨éŸž¡œ..."},
     {STRING_REBOOTCOMPUTER2,
-    "   ENTER = Reboot computer"},
+    "   ENTER = „§œ¤ ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"},
     {STRING_CONSOLEFAIL1,
-    "Unable to open the console\n\n"},
+    "€›ç¤˜«¦ ¤˜ ˜¤¦ ®«œå ž ¡¦¤©æ¢˜\n\n"},
     {STRING_CONSOLEFAIL2,
     "The most common cause of this is using an USB keyboard\n"},
     {STRING_CONSOLEFAIL3,
-    "USB keyboards are not fully supported yet\n"},
+    "’˜ USB §¢ž¡«¨¦¢æš ˜ ›œ¤ œå¤˜  §¢ã¨àª ¬§¦©«ž¨ æ£œ¤˜ ˜¡æ£˜\n"},
     {STRING_FORMATTINGDISK,
-    "Setup is formatting your disk"},
+    "† œš¡˜«á©«˜©ž › ˜£¦¨­é¤œ  «¦ ›å©¡¦ ©˜ª"},
     {STRING_CHECKINGDISK,
-    "Setup is checking your disk"},
+    "† œš¡˜«á©«˜©ž œ¢âš®œ  «¦ ›å©¡¦ ©˜ª"},
     {STRING_FORMATDISK1,
-    " Format partition as %S file system (quick format) "},
+    " ƒ ˜£æ¨­à©ž «¦¬ partition ઠ%S ©ç©«ž£˜ ˜¨®œåठ(š¨ãš¦¨ž › ˜£æ¨­à©ž) "},
     {STRING_FORMATDISK2,
-    " Format partition as %S file system "},
+    " ƒ ˜£æ¨­à©ž «¦¬ partition ઠ%S ©ç©«ž£˜ ˜¨®œåठ"},
     {STRING_KEEPFORMAT,
-    " Keep current file system (no changes) "},
+    " Œ˜ §˜¨˜£œå¤œ  «¦ ©ç©«ž£˜ ˜¨®œåठઠ⮜  (¡˜£å˜ ˜¢¢˜šã) "},
     {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ."},
+    "%I64u %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ."},
     {STRING_HDDINFOUNK1,
-    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    "%I64u %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Type %lu    %I64u %s"},
     {STRING_HDINFOPARTDELETE,
@@ -1686,29 +1686,29 @@
     {STRING_HDDINFOUNK3,
     "on %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
     {STRING_HDINFOPARTZEROED,
-    "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    "‘¡¢ž¨æª ›å©¡¦ª %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
     {STRING_HDDINFOUNK4,
     "%c%c  Type %lu    %I64u %s"},
     {STRING_HDINFOPARTEXISTS,
-    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    "©«¦ ©¡¢ž¨æ ›å©¡¦ %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
     {STRING_HDDINFOUNK5,
     "%c%c  Type %-3u                         %6lu %s"},
     {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %S"},
+    "%6lu %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu) on %S"},
     {STRING_HDDINFOUNK6,
-    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    "%6lu %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
     {STRING_NEWPARTITION,
-    "Setup created a new partition on"},
+    "† œš¡˜«á©«˜©ž ›ž£ ¦ç¨šž©œ ⤘ ¤â¦ partition ©«¦"},
     {STRING_UNPSPACE,
     "    Unpartitioned space              %6lu %s"},
     {STRING_MAXSIZE,
-    "MB (max. %lu MB)"},
+    "MB (£œš. %lu MB)"},
     {STRING_UNFORMATTED,
-    "New (Unformatted)"},
+    "Œâ¦ (‹ž › ˜£¦¨­à£â¤¦)"},
     {STRING_FORMATUNUSED,
-    "Unused"},
+    "€®¨ž© £¦§¦åž«¦"},
     {STRING_FORMATUNKNOWN,
-    "Unknown"},
+    "ꚤ੫¦"},
     {STRING_KB,
     "KB"},
     {STRING_MB,
@@ -1716,7 +1716,7 @@
     {STRING_GB,
     "GB"},
     {STRING_ADDKBLAYOUTS,
-    "Adding keyboard layouts"},
+    "‚夜«˜  §¨¦©Ÿã¡ž «à¤ › ˜«á¥œà¤ §¢ž¡«¨¦¢¦šå¦¬"},
     {0, 0}
 };
Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -22,48 +22,48 @@
  CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12
  LTEXT "Servidor DNS Alterno:", -1, 14, 186, 135, 8
  CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12
- PUSHBUTTON "&Avanzado", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+ PUSHBUTTON "Opciones &avanzado", IDC_ADVANCED, 156, 209, 80, 14,
WS_TABSTOP
 END
 IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Alternate Configuration"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT "If this computer is used on more than one network, enter the alternate IP
settings below", -1, 9, 9, 220, 20
-    CONTROL "Au&tomatic private IP address", IDC_USEDHCP,
"BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+CAPTION "Configuración alternativa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Escriba a continuación la configuración IP alternativa si este equipo  se
utiliza en más de una red.", -1, 9, 9, 220, 20
+    CONTROL "&Dirección IP privada automática", IDC_USEDHCP,
"BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
     GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
-    LTEXT "&IP address:", -1, 14, 75, 135, 8
+    CONTROL "Configurada por el u&suario", IDC_NODHCP, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 90, 12
+    LTEXT "Dire&cción IP:", -1, 14, 75, 135, 8
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80,
12
-    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
+    LTEXT "Máscara de s&ubred:", -1, 14, 95, 135, 8
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95,
80, 12
-    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
+    LTEXT "&Puerta de enlace predeterminada:", -1, 14, 115, 135, 8
     CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115,
80, 12
-    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
+    LTEXT "S&ervidor DNS preferido:", -1, 14, 150, 135, 8
     CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12
-    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
+    LTEXT "Servidor DNS alternati&vo:", -1, 14, 165, 180, 8
     CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12
 END
 IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE  0, 0, 247, 247
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "IP Settings"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "IP addressen", -1, 5, 5, 240, 90
+CAPTION "Configuración de IP"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Direcciones &IP ", -1, 5, 5, 240, 90
     CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15,
210, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
+    PUSHBUTTON "Agregar...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modificar...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Quitar", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
+    GROUPBOX "Puertas de enlace predeterminadas:", -1, 5, 100, 240, 90
     CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110,
210, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Agregar...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modificar...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Quitar", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
+    CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 200, 85, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Métrica de la interfaz:", -1, 15, 215, 90, 12
     EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
 END
@@ -73,158 +73,158 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY
-    LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP
enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes",
IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix",
IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX,
"BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12
+    LTEXT "Direcciones de servidores DNS, por orden de utili&zación:", -1,
5, 5, 180, 12
+    PUSHBUTTON "Subir", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bajar", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Agr&egar...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modifi&car...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Quitar", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP
+    LTEXT "Los siguientes tres parámetros se aplican a todas las conexiones que
tienen habilitado TCP/IP. Para resolución de nombres no cualificados:", -1, 5, 90,
225, 24
+    CONTROL "Anexar sufijos DNS principa&les y de conexiones específicas",
IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 210, 12
+    CHECKBOX "Anexar sufijos primarios del su&fijo DNS principal",
IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "A&nexar estos sufijos DNS (en este orden):", IDC_SELSUFFIX,
"BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12
     LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14
+    PUSHBUTTON "Subir", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bajar", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ag&regar...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Mo&dificar...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14,
WS_TABSTOP
+    PUSHBUTTON "Qui&tar", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP
+    LTEXT "&Sufijo DNS para esta conexión:", -1, 5, 227, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS",
IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration",
IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Registrar estas direcciones de cone&xiones en DNS",
IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Utilizar este sufijo DNS de conexión para registro DNS",
IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE  0, 0, 247, 247
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Options"
+CAPTION "Opciones"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX IDC_OPTLIST, 5, 30, 230, 70
-    LTEXT "&Optional settings", -1, 5, 15, 130, 12
-    PUSHBUTTON "&Properties", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP
-    GROUPBOX "Description:", -1, 5, 120, 240, 70
+    LTEXT "&Configuración opcional", -1, 5, 15, 130, 12
+    PUSHBUTTON "&Propiedades", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP
+    GROUPBOX "Descripción: ", -1, 5, 120, 240, 70
     LTEXT "", IDC_OPTDESC, 15, 130, 220, 33
 END
 IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE  0, 0, 200, 70
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Address"
+CAPTION "Dirección TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80,
12
-    LTEXT "IP address:", -1, 5, 15, 70, 12
-    LTEXT "Subnet mask:", -1, 5, 30, 70, 12
+    LTEXT "Dirección IP:", -1, 5, 15, 70, 12
+    LTEXT "Máscara de subred:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE  0, 0, 200, 80
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Gateway Address"
+CAPTION "Dirección TCP/IP de puerta de enlace"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80,
12
-    LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
+    LTEXT "Puerta de enlace:", -1, 5, 15, 70, 12
+    CHECKBOX "Métrica automática", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Métrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE  0, 0, 200, 80
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP DNS Server"
+CAPTION "Servidor TCP/IP DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
-    LTEXT "DNS server:", -1, 5, 10, 120, 12
+    LTEXT "Servidor DNS:", -1, 5, 10, 120, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE  0, 0, 200, 80
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Domain Suffix"
+CAPTION "Sufijo del dominio TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
-    LTEXT "Domain suffix:", -1, 5, 10, 120, 12
+    LTEXT "Sufijo del dominio:", -1, 5, 10, 120, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE  0, 0, 305, 220
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Filtering"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5,
190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+CAPTION "Filtrado TCP/IP"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CHECKBOX "Habilitar filtrado TCP/IP (todos los adaptadores)",
IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     GROUPBOX "", -1, 5, 30, 90, 150
-    CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
-    CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
+    CONTROL "Permitir todos", IDC_TCP_ALLOW_ALL, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 60, 12
+    CONTROL "Permitir sólo", IDC_TCP_RESTRICT, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
     CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72,
75
-    PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Agregar", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Quitar", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 105, 30, 90, 150
-    CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
-    CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
+    CONTROL "Permitir todos", IDC_UDP_ALLOW_ALL, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 60, 12
+    CONTROL "Permitir sólo", IDC_UDP_RESTRICT, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
     CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62,
72, 75
-    PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Agregar", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Quitar", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 205, 30, 90, 150
-    CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
-    CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
+    CONTROL "Permitir todos", IDC_IP_ALLOW_ALL, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 60, 12
+    CONTROL "Permitir sólo", IDC_IP_RESTRICT, "BUTTON",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
-    PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Agregar", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Quitar", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Aceptar", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE  0, 0, 200, 60
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Filter"
+CAPTION "Agregar filtro"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Aceptar", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 STRINGTABLE
 BEGIN
-       IDS_NET_CONNECT "Network connection"
-       IDS_NO_IPADDR_SET   "The adapter requires at least one IP address. Please
enter one."
-       IDS_NO_SUBMASK_SET  "You have entered an address that is missing its subnet
mask. Please add a subnet mask."
-       IDS_TCPFILTERDESC   "TCP/IP filtering allows you to control the type of
TCP/IP network traffic that reaches your computer."
-       IDS_TCPFILTER       "TCP/IP Filtering"
-       IDS_IPADDR          "IP address"
-       IDS_SUBMASK         "Subnet mask"
-       IDS_GATEWAY         "Gateway"
-       IDS_METRIC          "Metric"
-       IDS_DHCPACTIVE      "DHCP Enabled"
-       IDS_AUTOMATIC       "Automatic"
-       IDS_NOITEMSEL       "You have not selected an item. Select one first."
+       IDS_NET_CONNECT "Conexión de red"
+       IDS_NO_IPADDR_SET   "El adaptador requiere al menos una dirección IP. Escriba
una."
+       IDS_NO_SUBMASK_SET  "Ha introducido una dirección que esta pierdiendo su
máscara de subred. Por favor,añada una máscara de subred."
+       IDS_TCPFILTERDESC   "El filtro TCP/IP le permite controlar el tipo de tráfico
de red TCP/IP que llega a su equipo."
+       IDS_TCPFILTER       "Filtrado TCP/IP"
+       IDS_IPADDR          "Dirección IP"
+       IDS_SUBMASK         "Máscara de subred"
+       IDS_GATEWAY         "Puerta de enlace"
+       IDS_METRIC          "Métrica"
+       IDS_DHCPACTIVE      "DHCP habilitado"
+       IDS_AUTOMATIC       "Automático"
+       IDS_NOITEMSEL       "No ha seleccionado ningún elemento. Seleccione uno
primero."
        IDS_TCPIP           "ReactOS-TCP/IP"
-       IDS_ADD             "Add"
-       IDS_MOD             "OK"
-       IDS_TCP_PORTS       "TCP Ports"
-       IDS_UDP_PORTS       "UDP Ports"
-       IDS_IP_PROTO        "IP protocols"
-       IDS_PORT_RANGE      "Port numbers must be greater than 0 and less than 65536.
Please enter a number within this range."
-       IDS_PROT_RANGE      "Protocol numbers must be greater than 0 and less than
256. Please enter a number within this range."
-       IDS_DUP_NUMBER      "The number you are trying to add is already in the list.
Please enter a different number."
+       IDS_ADD             "Agregar"
+       IDS_MOD             "Aceptar"
+       IDS_TCP_PORTS       "Puertos TCP"
+       IDS_UDP_PORTS       "Puertos UDP"
+       IDS_IP_PROTO        "Protocolos IP"
+       IDS_PORT_RANGE      "Los números de puerto deben ser mayores que 0 y menores
que 65536. Escriba un número incluido en este intervalo."
+       IDS_PROT_RANGE      "Los números de protocolo deben ser mayores que 0 y
menores que 256. Escriba un número incluido en este intervalo."
+       IDS_DUP_NUMBER      "El número que esta intentando agregar ya esta en la
lista. Escriba un número diferente."
        IDS_DISABLE_FILTER  "Disabling this global TCP/IP setting will affect all
adapters."
-       IDS_NO_SUFFIX       "The current setting of search method requires at least
one DNS suffix. Please enter one or change the setting."
-       IDS_DOMAIN_SUFFIX   "Domain suffix is not a valid suffix."
-       IDS_DNS_SUFFIX      "The DNS domain name ""%s"" is not a
valid DNS name."
-       IDS_DUP_SUFFIX      "The DNS suffix is already on the list."
-       IDS_DUP_IPADDR      "The IP address is already on the list."
-       IDS_DUP_GW          "The default gateway is already on the list."
-END
-
+       IDS_NO_SUFFIX       "La configuración actual del método de búsqueda requiere
al menos un sufijo DNS. Escriba uno o cambie la configuración."
+       IDS_DOMAIN_SUFFIX   "El sufijo del dominio no es un sufijo válido."
+       IDS_DNS_SUFFIX      "El nombre de dominio DNS ""%s"" no
es un nombre DNS válido."
+       IDS_DUP_SUFFIX      "El sufijo DNS ya está en la lista."
+       IDS_DUP_IPADDR      "La dirección IP ya está en la lista."
+       IDS_DUP_GW          "La puerta de enlace predeterminada ya está en la
lista."
+END
+
Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es…
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Tue Oct 14 08:47:07 2008
@@ -92,7 +92,7 @@
        IDS_FORMAT_KBIT             "%u KBit/s"
        IDS_FORMAT_MBIT             "%u MBit/s"
        IDS_FORMAT_GBIT             "%u GBit/s"
-       IDS_DURATION_DAY            "%d Day %s"
-       IDS_DURATION_DAYS           "%d Days %s"
+       IDS_DURATION_DAY            "%d Día %s"
+       IDS_DURATION_DAYS           "%d Días %s"
 END