[ros-diffs] [dreimer] 43184: Sync xcopy, winhlp32 and wordpad to Wine 1.1.30
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Sun Sep 27 14:09:19 CEST 2009
Author: dreimer
Date: Sun Sep 27 14:09:18 2009
New Revision: 43184
URL: http://svn.reactos.org/svn/reactos?rev=43184&view=rev
Log:
Sync xcopy, winhlp32 and wordpad to Wine 1.1.30
Added:
trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc (with props)
trunk/reactos/base/applications/winhlp32/Ro.rc (with props)
Modified:
trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
trunk/reactos/base/applications/winhlp32/It.rc
trunk/reactos/base/applications/winhlp32/rsrc.rc
trunk/reactos/base/applications/wordpad/print.c
trunk/reactos/base/applications/wordpad/wordpad.c
Added: trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc?rev=43184&view=auto
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc (added)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -1,0 +1,84 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Japanese language support
+ *
+ * Copyright (C) 2007 J. Edmeades
+ * Copyright (C) 2009 Akihiro Sagawa
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "xcopy.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+ STRING_INVPARMS, "パラメータã®æ•°ãŒé•ã„ã¾ã™ã€‚xcopy /? ã§ä½¿ã„方を表示ã—ã¾ã™\n"
+ STRING_INVPARM, "無効ãªãƒ‘ラメータ '%s' ã§ã™ã€‚xcopy /? ã§ä½¿ã„方を表示ã—ã¾ã™\n"
+ STRING_PAUSE, "コピーを開始ã™ã‚‹ã«ã¯ <enter> を押ã—ã¦ãã ã•ã„\n"
+ STRING_SIMCOPY, "%d ファイルãŒã‚³ãƒ”ーã•ã‚Œã‚‹è¦‹è¾¼ã¿ã§ã™ã€‚\n"
+ STRING_COPY, "%d ファイルをコピーã—ã¾ã—ãŸ\n"
+ STRING_QISDIR, "é€ã‚Šå
ˆã® '%s' ã¯ãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã‹ã€\n" \
+ "ディレクトリã§ã™ã‹?\n" \
+ "(F - ファイルã€D - ディレクトリ)\n"
+ STRING_SRCPROMPT,"%s? (Yes|No)\n"
+ STRING_OVERWRITE,"%s を上書ãã—ã¾ã™ã‹? (Yes|No|All)\n"
+ STRING_COPYFAIL, "'%s' ã‹ã‚‰ '%s' ã¸ã®ã‚³ãƒ”ーã¯å¤±æ•—ã—ã¾ã—ãŸã€‚戻り値 %d\n"
+ STRING_OPENFAIL, "'%s' ã‚’é–‹ã‘ã¾ã›ã‚“\n"
+ STRING_READFAIL, "'%s' ã®èªã¿è¾¼ã¿ä¸ã«å¤±æ•—ã—ã¾ã—ãŸ\n"
+ STRING_YES_CHAR, "Y"
+ STRING_NO_CHAR, "N"
+ STRING_ALL_CHAR, "A"
+ STRING_FILE_CHAR,"F"
+ STRING_DIR_CHAR, "D"
+
+ STRING_HELP,
+"XCOPY - é€ã‚Šå
ƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚„ディレクトリをé€ã‚Šå
ˆã«ã‚³ãƒ”ーã—ã¾ã™\n\
+\n\
+構文:\n\
+XCOPY é€ã‚Šå
ƒ [é€ã‚Šå
ˆ] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+オプション:\n\
+\n\
+[/I] é€ã‚Šå
ˆãŒå˜åœ¨ã›ãšã€è¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’コピーã™ã‚‹ã¨ãã¯ã€é€ã‚Šå
ˆã‚’\n\
+\tディレクトリã¨ã¿ãªã—ã¾ã™ã€‚\n\
+[/S] ディレクトリã¨ã‚µãƒ–ディレクトリをコピーã—ã¾ã™ã€‚\n\
+[/E] 空ディレクトリをå«ã‚ã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ã‚µãƒ–ディレクトリをコピー。\n\
+[/Q] コピーä¸ã«ãƒ•ã‚¡ã‚¤ãƒ«åを一覧ã«ã—ã¾ã›ã‚“。ã™ãªã‚ã¡å¯¡é»™ã§ã™ã€‚\n\
+[/F] コピーä¸ã«ãƒ•ãƒ«ãƒ‘スã§é€ã‚Šå
ƒã¨é€ã‚Šå
ˆã®åå‰ã‚’表示ã—ã¾ã™ã€‚\n\
+[/L] æ“作を模擬実行ã—ã€ã‚³ãƒ”ー予定ã®ãƒ•ã‚¡ã‚¤ãƒ«åを表示ã—ã¾ã™ã€‚\n\
+[/W] コピーを開始ã™ã‚‹å‰ã«ç¢ºèªã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ã€‚\n\
+[/T] 空ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæ§‹é€ を作æˆã—ã¾ã™ãŒã€ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚³ãƒ”ーã—ã¾ã›ã‚“。\n\
+[/Y] ファイルを上書ãã™ã‚‹æ™‚ã«ç¢ºèªã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¾ã›ã‚“。\n\
+[/-Y] ファイルを上書ãã™ã‚‹æ™‚ã«ç¢ºèªã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ã€‚\n\
+[/P] å„ファイルã®ã‚³ãƒ”ーå‰ã«ç¢ºèªã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ã€‚\n\
+[/N] çŸã„ファイルåを利用ã—ã¦ã‚³ãƒ”ーã—ã¾ã™ã€‚\n\
+[/U] é€ã‚Šå
ˆã«ã‚るファイルã ã‘コピーã—ã¾ã™ã€‚\n\
+[/R] èªã¿å–り専用ファイルを上書ãã—ã¾ã™ã€‚\n\
+[/H] éš ã—ファイルやシステムファイルもコピーã—ã¾ã™ã€‚\n\
+[/C] コピーä¸ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ã“ã£ã¦ã‚‚続行ã—ã¾ã™ã€‚\n\
+[/A] アーカイブ属性ã®ãƒ•ã‚¡ã‚¤ãƒ«ã ã‘コピーã—ã¾ã™ã€‚\n\
+[/M] アーカイブ属性ã®ãƒ•ã‚¡ã‚¤ãƒ«ã ã‘コピーã—ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–属性を\n\
+\tå–り除ãã¾ã™ã€‚\n\
+[/D | /D:月-æ—¥-å¹´] æ–°ã—ã„ファイルや指定ã•ã‚ŒãŸæ—¥ä»˜ä»¥é™ã«å¤‰æ›´ã•ã‚ŒãŸ\n\
+\t\tファイルをコピーã—ã¾ã™ã€‚日付ãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã¯ã€\n\
+\t\tコピーå
ˆãŒã‚³ãƒ”ーå
ƒã‚ˆã‚Šå¤ã„ファイルã ã‘コピーã—ã¾ã™ã€‚\n\n"
+
+}
+#pragma code_page(default)
Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc?rev=43184&r1=43183&r2=43184&view=diff
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -30,6 +30,7 @@
#include "De.rc"
#include "En.rc"
#include "Fr.rc"
+#include "Ja.rc"
#include "Ko.rc"
#include "Lt.rc"
#include "Nl.rc"
Modified: trunk/reactos/base/applications/winhlp32/It.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/It.rc?rev=43184&r1=43183&r2=43184&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -31,7 +31,7 @@
MENUITEM "&Apri...", MNID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "S&tampa", MNID_FILE_PRINT
- MENUITEM "&Setup stampante...", MNID_FILE_SETUP
+ MENUITEM "&Installazione stampante...", MNID_FILE_SETUP
MENUITEM SEPARATOR
MENUITEM "&Esci", MNID_FILE_EXIT
}
Added: trunk/reactos/base/applications/winhlp32/Ro.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/Ro.rc?rev=43184&view=auto
==============================================================================
--- trunk/reactos/base/applications/winhlp32/Ro.rc (added)
+++ trunk/reactos/base/applications/winhlp32/Ro.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -1,0 +1,133 @@
+/*
+ * Help Viewer
+ *
+ * Copyright 1996 Ulrich Schmid
+ * Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
+ * Copyright 2009 Michael Stefaniuc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "winhelp_res.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+/* Menu */
+
+MAIN_MENU MENU
+{
+ POPUP "&Fișier" {
+ MENUITEM "&Deschide", MNID_FILE_OPEN
+ MENUITEM SEPARATOR
+ MENUITEM "&Tipărește", MNID_FILE_PRINT
+ MENUITEM "&Setare imprimantă", MNID_FILE_SETUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Ieșire", MNID_FILE_EXIT
+ }
+ POPUP "&Editare" {
+ MENUITEM "&Copiază...", MNID_EDIT_COPYDLG
+ MENUITEM SEPARATOR
+ MENUITEM "&Adnotează...", MNID_EDIT_ANNOTATE
+ }
+ POPUP "&Se&mn de carte" {
+ MENUITEM "&Definește...", MNID_BKMK_DEFINE
+ }
+ POPUP "&Opțiuni" {
+ POPUP "&Ajutor întotdeauna vizibil"
+ BEGIN
+ MENUITEM "Implicit", MNID_OPTS_HELP_DEFAULT
+ MENUITEM "Vizibil", MNID_OPTS_HELP_VISIBLE
+ MENUITEM "Invizibil", MNID_OPTS_HELP_NONVISIBLE
+ END
+ MENUITEM "Istorie", MNID_OPTS_HISTORY
+ POPUP "&Font"
+ BEGIN
+ MENUITEM "Mic", MNID_OPTS_FONTS_SMALL
+ MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL
+ MENUITEM "Mare", MNID_OPTS_FONTS_LARGE
+ END
+ MENUITEM "Utilizează culorile sistemului", MNID_OPTS_SYSTEM_COLORS
+ }
+ POPUP "&Ajutor" {
+ MENUITEM "Ajut&or despre ajutor", MNID_HELP_HELPON
+ MENUITEM "ÃŽn&totdeauna deasupra", MNID_HELP_HELPTOP
+ MENUITEM SEPARATOR
+ MENUITEM "&Informații...", MNID_HELP_ABOUT
+#ifdef WINELIB
+ MENUITEM "&Despre Wine", MNID_HELP_WINE
+#endif
+ }
+}
+
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Index"
+{
+ LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+}
+
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Căutare"
+{
+ LTEXT "Încă neimplementată", -1, 10, 10, 180, 150
+}
+
+/* Strings */
+STRINGTABLE DISCARDABLE
+{
+STID_WINE_HELP, "Ajutor Wine"
+STID_WHERROR, "EROARE"
+STID_WARNING, "AVERTISMENT"
+STID_INFO, "Informație"
+STID_NOT_IMPLEMENTED, "Neimplementat"
+STID_HLPFILE_ERROR_s, "Eroare la citirea fiÈ™ierului de ajutor „%sâ€"
+STID_INDEX, "&Index"
+STID_CONTENTS, "Rezumat"
+STID_BACK, "ÃŽn&apoi"
+STID_ALL_FILES, "Toate fișierele (*.*)"
+STID_HELP_FILES_HLP, "Fișierele de ajutor (*.hlp)"
+STID_FILE_NOT_FOUND_s "Fișierul „%s†nu poate fi găsit. Vreți să-l cautați?"
+STID_NO_RICHEDIT "Nu am găsit o implementare pentru richedit... Abandonez"
+STID_PSH_INDEX, "Subiecte de ajutor:"
+}
+
+CONTEXT_MENU MENU
+BEGIN
+ POPUP ""
+ BEGIN
+ MENUITEM "Adnotare...", MNID_CTXT_ANNOTATE
+ MENUITEM "Copiază", MNID_CTXT_COPY
+ MENUITEM "Tipărește...", MNID_CTXT_PRINT
+ POPUP "Fonturi"
+ BEGIN
+ MENUITEM "Mic", MNID_CTXT_FONTS_SMALL
+ MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL
+ MENUITEM "Mare", MNID_CTXT_FONTS_LARGE
+ END
+ POPUP "Ajutorul întotdeauna vizibil"
+ BEGIN
+ MENUITEM "Implicit", MNID_CTXT_HELP_DEFAULT
+ MENUITEM "Vizibil", MNID_CTXT_HELP_VISIBLE
+ MENUITEM "Invizibil", MNID_CTXT_HELP_NONVISIBLE
+ END
+ MENUITEM "Utilizează culorile sistemului", MNID_CTXT_SYSTEM_COLORS
+ END
+END
+#pragma code_page(default)
Propchange: trunk/reactos/base/applications/winhlp32/Ro.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/rsrc.rc?rev=43184&r1=43183&r2=43184&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -42,6 +42,7 @@
#include "Pl.rc"
#include "Pt.rc"
#include "Rm.rc"
+#include "Ro.rc"
#include "Ru.rc"
#include "Si.rc"
#include "Sk.rc"
Modified: trunk/reactos/base/applications/wordpad/print.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/print.c?rev=43184&r1=43183&r2=43184&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -97,7 +97,7 @@
WS_VISIBLE | WS_CHILD, 5, 5, 100, 15,
hRebarWnd, ULongToHandle(command), hInstance, NULL);
- rb.cbSize = sizeof(rb);
+ rb.cbSize = REBARBANDINFOW_V6_SIZE;
rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID;
rb.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT;
rb.hwndChild = hButton;
@@ -448,7 +448,7 @@
WS_VISIBLE | WS_CHILD, 0, 0, 0, 0,
hReBar, NULL, NULL, NULL);
- rb.cbSize = sizeof(rb);
+ rb.cbSize = REBARBANDINFOW_V6_SIZE;
rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID;
rb.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT;
rb.hwndChild = hStatic;
Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/wordpad.c?rev=43184&r1=43183&r2=43184&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -644,7 +644,7 @@
REBARBANDINFOW rbbinfo;
int index = SendMessageW(hwndReBar, RB_IDTOINDEX, BANDID_FONTLIST, 0);
- rbbinfo.cbSize = sizeof(rbbinfo);
+ rbbinfo.cbSize = REBARBANDINFOW_V6_SIZE;
rbbinfo.fMask = RBBIM_STYLE;
SendMessageW(hwndReBar, RB_GETBANDINFO, index, (LPARAM)&rbbinfo);
@@ -1795,7 +1795,7 @@
SendMessageW(hToolBarWnd, TB_AUTOSIZE, 0, 0);
- rbb.cbSize = sizeof(rbb);
+ rbb.cbSize = REBARBANDINFOW_V6_SIZE;
rbb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD | RBBIM_STYLE | RBBIM_ID;
rbb.fStyle = RBBS_CHILDEDGE | RBBS_BREAK | RBBS_NOGRIPPER;
rbb.cx = 0;
More information about the Ros-diffs
mailing list