[ros-diffs] [dreimer] 36613: sync winhlp32 and wordpad with wine
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Wed Oct 1 16:17:09 CEST 2008
Author: dreimer
Date: Wed Oct 1 09:17:09 2008
New Revision: 36613
URL: http://svn.reactos.org/svn/reactos?rev=36613&view=rev
Log:
sync winhlp32 and wordpad with wine
Modified:
trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc
trunk/reactos/base/applications/wordpad/De.rc
trunk/reactos/base/applications/wordpad/Hu.rc
trunk/reactos/base/applications/wordpad/Ja.rc
trunk/reactos/base/applications/wordpad/wordpad.c
Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc?rev=36613&r1=36612&r2=36613&view=diff
==============================================================================
--- 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] Wed Oct 1 09:17:09 2008
@@ -68,7 +68,7 @@
IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
+FONT 9, "MS Shell Dlg"
CAPTION "õˆø"
{
LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
@@ -76,7 +76,7 @@
IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
+FONT 9, "MS Shell Dlg"
CAPTION "ŒŸõ"
{
LTEXT "–¢ŽÀ‘•", -1, 10, 10, 180, 150
Modified: trunk/reactos/base/applications/wordpad/De.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/De.rc?rev=36613&r1=36612&r2=36613&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Wed Oct 1 09:17:09 2008
@@ -18,12 +18,14 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
IDM_MAINMENU MENU DISCARDABLE
BEGIN
POPUP "&Datei"
BEGIN
MENUITEM "&Neu...\tStrg+N", ID_FILE_NEW
- MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN
+ MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN
MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE
MENUITEM "Speichern &unter...", ID_FILE_SAVEAS
MENUITEM SEPARATOR
@@ -35,21 +37,21 @@
END
POPUP "&Bearbeiten"
BEGIN
- MENUITEM "&Rückgängig\tStrg+Z", ID_EDIT_UNDO
+ MENUITEM "&Rückgängig\tStrg+Z", ID_EDIT_UNDO
MENUITEM "&Wiederholen\tStrg+Y", ID_EDIT_REDO
MENUITEM SEPARATOR
MENUITEM "&Ausschneiden\tStrg+X", ID_EDIT_CUT
MENUITEM "&Kopieren\tStrg+C", ID_EDIT_COPY
- MENUITEM "&Einfügen\tStrg+V", ID_EDIT_PASTE
- MENUITEM "&Löschen\tEntf", ID_EDIT_CLEAR
+ MENUITEM "&Einfügen\tStrg+V", ID_EDIT_PASTE
+ MENUITEM "&Löschen\tEntf", ID_EDIT_CLEAR
MENUITEM "Alles &markieren\tStrg+A", ID_EDIT_SELECTALL
MENUITEM SEPARATOR
MENUITEM "&Suchen...\tStrg+F", ID_FIND
MENUITEM "&Weitersuchen\tF3", ID_FIND_NEXT
MENUITEM "Erset&zen...\tStrg+H", ID_REPLACE
MENUITEM SEPARATOR
- MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY
- MENUITEM "&Geändert", ID_EDIT_MODIFIED
+ MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY
+ MENUITEM "&Geändert", ID_EDIT_MODIFIED
MENUITEM SEPARATOR
POPUP "&Extras"
BEGIN
@@ -69,14 +71,14 @@
MENUITEM SEPARATOR
MENUITEM "&Optionen...", ID_VIEWPROPERTIES
END
- POPUP "&Einfügen"
+ POPUP "&Einfügen"
BEGIN
MENUITEM "&Datum und Uhrzeit...", ID_DATETIME
END
POPUP "Forma&t"
BEGIN
MENUITEM "Sch&riftart...", ID_FONTSETTINGS
- MENUITEM "Auf&zählungszeichen" ID_BULLET
+ MENUITEM "Auf&zählungszeichen" ID_BULLET
MENUITEM "&Absatz..." ID_PARAFORMAT
MENUITEM "&Tabstopps..." ID_TABSTOPS
POPUP "&Hintergrund"
@@ -87,7 +89,7 @@
END
POPUP "&?"
BEGIN
- MENUITEM "Ü&ber Wine Wordpad" ID_ABOUT
+ MENUITEM "Ü&ber Wine Wordpad" ID_ABOUT
END
END
@@ -97,9 +99,9 @@
BEGIN
MENUITEM "Aus&schneiden", ID_EDIT_CUT
MENUITEM "&Kopieren", ID_EDIT_COPY
- MENUITEM "&Einfügen", ID_EDIT_PASTE
- MENUITEM SEPARATOR
- MENUITEM "Auf&zählungszeichen" ID_BULLET
+ MENUITEM "&Einfügen", ID_EDIT_PASTE
+ MENUITEM SEPARATOR
+ MENUITEM "Auf&zählungszeichen" ID_BULLET
MENUITEM "&Absatz..." ID_PARAFORMAT
END
END
@@ -109,7 +111,7 @@
CAPTION "Datum und Uhrzeit"
FONT 10, "MS Sans Serif"
BEGIN
- LTEXT "Verfügbare Formate",0,3,2,100,15
+ LTEXT "Verfügbare Formate",0,3,2,100,15
LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT
PUSHBUTTON "&OK",IDOK,87,12,40,12
PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12
@@ -152,10 +154,10 @@
GROUPBOX "Tabstoppposition", 0, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15
- PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15
+ PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15
- PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15
+ PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15
END
IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
@@ -211,11 +213,11 @@
STRINGTABLE DISCARDABLE
BEGIN
STRING_PREVIEW_PRINT, "&Drucken"
- STRING_PREVIEW_NEXTPAGE, "&Nächste"
+ STRING_PREVIEW_NEXTPAGE, "&Nächste"
STRING_PREVIEW_PREVPAGE, "&Vorherige"
STRING_PREVIEW_TWOPAGES, "Zwei Seiten"
STRING_PREVIEW_ONEPAGE, "Eine Seite"
- STRING_PREVIEW_CLOSE, "&Schließen"
+ STRING_PREVIEW_CLOSE, "&Schließen"
END
STRINGTABLE DISCARDABLE
@@ -226,12 +228,18 @@
STRINGTABLE DISCARDABLE
BEGIN
STRING_DEFAULT_FILENAME, "Dokument"
- STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?"
+ STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?"
STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet."
STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden."
STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \
"Dadurch geht die Formatierung verloren. " \
- "Möchten Sie den Vorgang trotzdem fortsetzen?"
- STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig."
- STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt."
-END
+ "Möchten Sie den Vorgang trotzdem fortsetzen?"
+ STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig."
+ STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt."
+ STRING_WRITE_FAILED, "Die Datei konnte nicht gespeichert werden."
+ STRING_WRITE_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu speichern."
+ STRING_OPEN_FAILED, "Die Datei konnte nicht geöffnet werden."
+ STRING_OPEN_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu öffnen."
+END
+
+#pragma code_page(default)
Modified: trunk/reactos/base/applications/wordpad/Hu.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Hu.rc?rev=36613&r1=36612&r2=36613&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Wed Oct 1 09:17:09 2008
@@ -222,16 +222,3 @@
BEGIN
STRING_UNITS_CM, "cm"
END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- STRING_DEFAULT_FILENAME, "Document"
- STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?"
- STRING_SEARCH_FINISHED, "Finished searching the document."
- STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library."
- STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \
- "which will cause all formatting to be lost. " \
- "Are you sure that you wish to do this?"
- STRING_INVALID_NUMBER, "Invalid number format"
- STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported"
-END
Modified: trunk/reactos/base/applications/wordpad/Ja.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Ja.rc?rev=36613&r1=36612&r2=36613&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Wed Oct 1 09:17:09 2008
@@ -107,7 +107,7 @@
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "“ú•t‚ÆŽž"
-FONT 9, "MS UI Gothic"
+FONT 9, "MS Shell Dlg"
BEGIN
LTEXT "—˜—p‚Å‚«‚éŒ`Ž®",0,3,2,100,15
LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY
@@ -118,7 +118,7 @@
IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "V‹Kì¬"
-FONT 9, "MS UI Gothic"
+FONT 9, "MS Shell Dlg"
BEGIN
LTEXT "V‚µ‚¢•¶‘Œ`Ž®",0,3,2,100,15
LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
@@ -129,7 +129,7 @@
IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "’i—Ž‚ÌÝ’è"
-FONT 9, "MS UI Gothic"
+FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "ƒCƒ“ƒfƒ“ƒg", 0, 10, 10, 120, 68
LTEXT "¶(&L)", 0, 15, 22, 40, 13
@@ -147,7 +147,7 @@
IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "ƒ^ƒu‚ÌÝ’è"
-FONT 9, "MS UI Gothic"
+FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "ƒ^ƒu‚Ì’âŽ~ˆÊ’u(&T)", 0, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
@@ -161,7 +161,7 @@
IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
STYLE DS_SYSMODAL
CAPTION ""
-FONT 8, "MS Shell Dlg"
+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
Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/wordpad.c?rev=36613&r1=36612&r2=36613&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Wed Oct 1 09:17:09 2008
@@ -467,7 +467,7 @@
SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt);
}
-static void on_fontlist_modified(HWND hwndFontList, LPWSTR wszNewFaceName)
+static void on_fontlist_modified(LPWSTR wszNewFaceName)
{
CHARFORMAT2W format;
ZeroMemory(&format, sizeof(format));
@@ -1702,7 +1702,7 @@
return 0;
}
-static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
+static LRESULT OnCreate( HWND hWnd )
{
HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd;
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
@@ -1858,7 +1858,7 @@
return 0;
}
-static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam)
+static LRESULT OnUser( HWND hWnd )
{
HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR);
HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR);
@@ -1910,7 +1910,7 @@
return 0;
}
-static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam)
+static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
{
HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR);
HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR);
@@ -1925,10 +1925,10 @@
NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam;
if(pHdr->hwndFrom == hwndFontList)
{
- on_fontlist_modified(hwndFontList, (LPWSTR)endEdit->szText);
+ on_fontlist_modified((LPWSTR)endEdit->szText);
} else if (pHdr->hwndFrom == hwndSizeList)
{
- on_sizelist_modified(hwndSizeList, (LPWSTR)endEdit->szText);
+ on_sizelist_modified(hwndFontList,(LPWSTR)endEdit->szText);
}
}
return 0;
@@ -2322,7 +2322,7 @@
WCHAR buffer[LF_FACESIZE];
HWND hwndFontList = (HWND)lParam;
get_comboexlist_selection(hwndFontList, buffer, LF_FACESIZE);
- on_fontlist_modified(hwndFontList, buffer);
+ on_fontlist_modified(buffer);
}
break;
@@ -2343,7 +2343,7 @@
return 0;
}
-static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam )
+static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam )
{
HMENU hMenu = (HMENU)wParam;
HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR);
@@ -2456,13 +2456,13 @@
switch(msg)
{
case WM_CREATE:
- return OnCreate( hWnd, wParam, lParam );
+ return OnCreate( hWnd );
case WM_USER:
- return OnUser( hWnd, wParam, lParam );
+ return OnUser( hWnd );
case WM_NOTIFY:
- return OnNotify( hWnd, wParam, lParam );
+ return OnNotify( hWnd, lParam );
case WM_COMMAND:
if(preview_isactive())
@@ -2494,7 +2494,7 @@
return 0;
case WM_INITMENUPOPUP:
- return OnInitPopupMenu( hWnd, wParam, lParam );
+ return OnInitPopupMenu( hWnd, wParam );
case WM_SIZE:
return OnSize( hWnd, wParam, lParam );
More information about the Ros-diffs
mailing list