[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.
14 Oct
2008
14 Oct
'08
1:47 p.m.
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 "Rs[(&C)...", MNID_EDIT_COPYDLG
+ POPUP "ç·¨é(&E)" {
+ MENUITEM "ã³ãã¼(&C)...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "Rg(&A)...", MNID_EDIT_ANNOTATE
+ MENUITEM "ã³ã¡ã³ã(&A)...", MNID_EDIT_ANNOTATE
}
- POPUP "µ¨è(&B)" {
- MENUITEM "è`(&D)...", MNID_BKMK_DEFINE
+ POPUP "ããã(&B)" {
+ MENUITEM "å®ç¾©(&D)...", MNID_BKMK_DEFINE
}
- POPUP "IvV(&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 "tHg"
+ 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 "VXe J[ðg¤", MNID_OPTS_SYSTEM_COLORS
+ MENUITEM "ã·ã¹ãã ã«ã©ã¼ã使ã", MNID_OPTS_SYSTEM_COLORS
}
- POPUP "wv(&H)" {
- MENUITEM "wvÉ¢ÄÌwv(&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 wv"
-STID_WHERROR, "G["
-STID_WARNING, "x"
-STID_INFO, "îñ"
-STID_NOT_IMPLEMENTED, "ñÀ"
-STID_HLPFILE_ERROR_s, "wvt@C `%s' ðÇÝñÅ¢éÆ«ÉG["
-STID_INDEX, "õø(&I)"
-STID_CONTENTS, "Tv"
-STID_BACK, "ßé(&B)"
-STID_ALL_FILES, "·×ÄÌt@C (*.*)"
-STID_HELP_FILES_HLP, "wv t@C (*.hlp)"
-STID_FILE_NOT_FOUND_s "'%s'
ª©Â©èܹñB©ªÅ±Ìt@CðTµÜ·©?"
-STID_NO_RICHEDIT "b`GfBbgÀª©Â©èܹñ... I¹µÜ·"
-STID_PSH_INDEX, "wv gsbN: "
+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 "Rg...", MNID_CTXT_ANNOTATE
- MENUITEM "Rs[", MNID_CTXT_COPY
- MENUITEM "óü...", MNID_CTXT_PRINT
- POPUP "tHg"
+ 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 "VXe 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 "VKì¬(&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 "óüvr
[(&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 "Rs[(&C)\tCtrl+C", ID_EDIT_COPY
- MENUITEM "\\èt¯(&P)\tCtrl+V", ID_EDIT_PASTE
- MENUITEM "NA(&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 "Xe[^X o[(&S)", ID_TOGGLE_STATUSBAR
- MENUITEM SEPARATOR
- MENUITEM "IvV(&O)...", ID_VIEWPROPERTIES
- END
- POPUP "}ü(&I)"
- BEGIN
- MENUITEM "útÆ(&D)...", ID_DATETIME
- END
- POPUP "®(&O)"
- BEGIN
- MENUITEM "tHg(&F)...", ID_FONTSETTINGS
- MENUITEM "Óð«(&B)" ID_BULLET
- MENUITEM "i(&P)..." ID_PARAFORMAT
- MENUITEM "^u(&T)..." ID_TABSTOPS
- POPUP "wi(&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 "VXe(&S)\tCtrl+1", ID_BACK_1
+ MENUITEM "ã·ã¹ãã (&S)\tCtrl+1", ID_BACK_1
MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2
END
END
- POPUP "wv(&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 "Rs[(&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 "LZ(&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 "VKì¬"
-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 "LZ(&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 "Cfg", 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 "LZ(&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 "ÇÁ(&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 "LZ(&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 "EBhEÌ«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 "Xe[^Xo[(&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`eLXg`® (*.rtf)"
- STRING_TEXT_FILES_TXT, "eLXg¶ (*.txt)"
- STRING_TEXT_FILES_UNICODE_TXT, "UnicodeeLXg¶(*.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`eLXg¶"
- STRING_NEWFILE_TXT, "eLXg¶"
- STRING_NEWFILE_TXT_UNICODE, "UnicodeeLXg¶"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- STRING_PRINTER_FILES_PRN, "v^t@C (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- STRING_VIEWPROPS_TITLE, "IvV"
- STRING_VIEWPROPS_TEXT, "eLXg"
- STRING_VIEWPROPS_RICHTEXT, "b`eLXg"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- STRING_PREVIEW_PRINT, "óü"
- STRING_PREVIEW_NEXTPAGE, "Ìy[W"
- STRING_PREVIEW_PREVPAGE, "OÌy[W"
- STRING_PREVIEW_TWOPAGES, "2y[W"
- STRING_PREVIEW_ONEPAGE, "1y[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, "RichEditCuÌÇÝÝɸsB"
- STRING_SAVE_LOSEFORMATTING, "v[eLXg`®ÅÛ¶·éÆA" \
- "·×ÄÌ®ª¸íêÜ·B" \
- "»êÅàæ¢Å·©H"
- STRING_INVALID_NUMBER, "Ì®ªs³"
- STRING_OLE_STORAGE_NOT_SUPPORTED,
"OLEXg[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®ar...", 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
6082
days inactive
6082
days old
0 comments
1 participants
participants (1)
-
dreimer＠svn.reactos.org