[ros-diffs] [dreimer] 35962: Update winfile and write to most recent Wine Version.

Author: dreimer
Date: Fri Sep  5 12:00:16 2008
New Revision: 35962

URL: http://svn.reactos.org/svn/reactos?rev=35962&view=rev
Log:
Update winfile and write to most recent Wine Version.

Added:
    trunk/rosapps/applications/winfile/lang/ja-JP.rc   (with props)
Modified:
    trunk/rosapps/applications/winfile/lang/zh-CN.rc
    trunk/rosapps/applications/winfile/rsrc.rc
    trunk/rosapps/applications/winfile/winefile.c
    trunk/rosapps/applications/write/write.c

Added: trunk/rosapps/applications/winfile/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/…
==============================================================================
--- trunk/rosapps/applications/winfile/lang/ja-JP.rc (added)
+++ trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] Fri Sep  5 12:00:16
2008
@@ -1,0 +1,260 @@
+/*
+ * WineFile
+ * Japanese Language Support
+ *
+ * Copyright 2000 Martin Fuchs
+ * Copyright 2002 Steven Edwards
+ * Copyright 2002 Alexandre Julliard
+ *
+ * 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
+ */
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+/* Menu */
+
+IDM_WINEFILE MENU FIXED IMPURE
+{
+    POPUP "ƒtƒ@ƒCƒ‹(&F)"  {
+        MENUITEM "ŠJ‚­(&O)\tEnter",                ID_ACTIVATE
+        MENUITEM "ˆÚ“®(&M)...\tF7",                ID_FILE_MOVE
+        MENUITEM "ƒRƒs[(&C)...\tF8",                ID_FILE_COPY
+        MENUITEM "&In Clipboard...\tF9",        118
+        MENUITEM "íœ(&D)\tDel",                ID_FILE_DELETE
+        MENUITEM "–¼‘O‚̕ύX(&N)...",                  109
+        MENUITEM "ƒvƒƒpƒeƒB(&I)...\tAlt+Enter",   ID_EDIT_PROPERTIES
+        MENUITEM SEPARATOR
+        MENUITEM "ˆ³k(&O)...",                119
+        MENUITEM "‰ð“€(&O)...",              120
+        MENUITEM SEPARATOR
+        MENUITEM "ŽÀs(&R)...",                     ID_EXECUTE
+        MENUITEM "ˆóü(&P)...",                   102
+        MENUITEM "ŠÖ˜A•t‚¯...",                103
+        MENUITEM SEPARATOR
+        MENUITEM "ƒfƒBƒŒƒNƒgƒŠ‚ðì¬(&E)...",        111
+        MENUITEM "ŒŸõ(&H)...",                  104
+        MENUITEM "ƒtƒ@ƒCƒ‹‚ð‘I‘ð(&S)...",            116
+        MENUITEM SEPARATOR
+#ifndef _NO_EXTENSIONS
+        MENUITEM "I—¹(&X)\tAlt+X",                ID_FILE_EXIT
+#else
+        MENUITEM "I—¹(&X)",                       ID_FILE_EXIT
+#endif
+    }
+
+    POPUP "ƒfƒBƒXƒN(&D)"  {
+        MENUITEM "ƒfƒBƒXƒN‚ðƒRƒs[(&C)...",               201
+        MENUITEM "&Label Disk...",              202
+        MENUITEM SEPARATOR
+        MENUITEM "ƒfƒBƒXƒN‚ðƒtƒH[ƒ}ƒbƒg(&F)...",            
ID_FORMAT_DISK
+#ifdef _WIN95
+        MENUITEM "&Make System Disk...", -1 /*TODO*/
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "ƒlƒbƒgƒ[ƒNƒhƒ‰ƒCƒu‚ɐڑ±(&N)",     
ID_CONNECT_NETWORK_DRIVE
+        MENUITEM "ƒlƒbƒgƒ[ƒNƒhƒ‰ƒCƒu‚ðØ’f(&D)",  
ID_DISCONNECT_NETWORK_DRIVE
+        MENUITEM SEPARATOR
+        MENUITEM "Share as...",                 254
+        MENUITEM "&Remove Share...",            255
+        MENUITEM SEPARATOR
+        MENUITEM "ƒhƒ‰ƒCƒu‚ð‘I‘ð(&S)...",            251
+    }
+
+    POPUP "ƒfƒBƒŒƒNƒgƒŠ(&R)"  {
+        MENUITEM "&Next Level\t+",              301
+        MENUITEM "ƒcƒŠ[‚ð“WŠJ(&T)\t*",             302
+        MENUITEM "‚·‚ׂĂð“WŠJ(&A)\tStrg+*",         303
+        MENUITEM "ƒcƒŠ[‚ðÜ‚èô‚Þ(&T)\t-",           304
+        MENUITEM SEPARATOR
+        MENUITEM "&Mark Children",              505
+    }
+
+    POPUP "•\\Ž¦(&V)"  {
+        MENUITEM "ƒcƒŠ[‚ƃfƒBƒŒƒNƒgƒŠ(&R)",         413
+        MENUITEM "ƒcƒŠ[‚Ì‚Ý(&E)",                  411
+        MENUITEM "ƒfƒBƒŒƒNƒgƒŠ‚Ì‚Ý(&O)",             412
+        MENUITEM SEPARATOR
+        MENUITEM "•ªŠ„(&L)",                      ID_VIEW_SPLIT
+        MENUITEM SEPARATOR
+        MENUITEM "–¼‘O(&N)",                       ID_VIEW_NAME
+        MENUITEM "‚·‚ׂẴtƒ@ƒCƒ‹Ú×(&A)",          
ID_VIEW_ALL_ATTRIBUTES, CHECKED
+        MENUITEM "•”•ªÚ×(&P)...",         ID_VIEW_SELECTED_ATTRIBUTES
+        MENUITEM SEPARATOR
+        MENUITEM "–¼‘O‚Å•À‚בւ¦(&S)",               ID_VIEW_SORT_NAME
+        MENUITEM "Ží—Þ‚Å•À‚בւ¦(&B)",               ID_VIEW_SORT_TYPE
+        MENUITEM "ƒTƒCƒY‚Å•À‚בւ¦(&Z)",               ID_VIEW_SORT_SIZE
+        MENUITEM "“ú•t‚Å•À‚בւ¦(&D)",               ID_VIEW_SORT_DATE
+        MENUITEM SEPARATOR
+        MENUITEM "Filter by &...",              ID_VIEW_FILTER
+    }
+
+    POPUP "ƒIƒvƒVƒ‡ƒ“(&O)"  {
+        MENUITEM "Šm”F(&C)...",            501
+        MENUITEM "ƒtƒHƒ“ƒg(&F)...",                    ID_SELECT_FONT
+        MENUITEM "ƒc[ƒ‹ƒo[‚ðƒJƒXƒ^ƒ}ƒCƒY(&B)...",       512
+        MENUITEM SEPARATOR
+        MENUITEM "ƒc[ƒ‹ƒo[(&T)",                    ID_VIEW_TOOL_BAR,
CHECKED
+        MENUITEM "ƒhƒ‰ƒCƒuƒo[(&D)",                   ID_VIEW_DRIVE_BAR,
CHECKED
+        MENUITEM "ƒXƒe[ƒ^ƒXƒo[(&S)",                 ID_VIEW_STATUSBAR,
CHECKED
+#ifndef _NO_EXTENSIONS
+        MENUITEM "‘S‰æ–Ê•\\Ž¦(&U)\tCtrl+Shift+S",  ID_VIEW_FULLSCREEN
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "&Minimize on run",            504
+        MENUITEM "I—¹Žž‚ɐݒè‚ð•Û‘¶(&S)",      ID_VIEW_SAVESETTINGS
+    }
+
+
+    POPUP "ƒZƒLƒ…ƒŠƒeƒB(&S)"  {
+        MENUITEM "&Access...",                  605
+        MENUITEM "&Logging...",                 606
+        MENUITEM "&Owner...",                   607
+    }
+
+    POPUP "ƒEƒBƒ“ƒhƒE(&W)"  {
+        MENUITEM "V‹KƒEƒBƒ“ƒhƒE(&W)",                 ID_WINDOW_NEW
+        MENUITEM "d‚Ë‚Ä•\\Ž¦\tCtrl+F5",          ID_WINDOW_CASCADE
+        MENUITEM "ã‰º‚É•À‚ׂĕ\\Ž¦(&H)",          ID_WINDOW_TILE_HORZ
+        MENUITEM "¶‰E‚É•À‚ׂĕ\\Ž¦(&V)\tCtrl+F4",   ID_WINDOW_TILE_VERT
+#ifndef _NO_EXTENSIONS
+        MENUITEM "Arrange Automatically",       ID_WINDOW_AUTOSORT
+#endif
+        MENUITEM "Arrange &Symbols",            ID_WINDOW_ARRANGE
+        MENUITEM "XV(&R)\tF5",                ID_REFRESH
+    }
+
+    POPUP "ƒwƒ‹ƒv(&H)"  {
+        MENUITEM "ƒwƒ‹ƒv ƒgƒsƒbƒN(&H)\tF1",            ID_HELP
+        MENUITEM "ƒwƒ‹ƒv‚ÌŒŸõ(&S)...\tF1",         ID_HELP
+        MENUITEM "ƒwƒ‹ƒv‚ðŽg‚¤(&U)\tF1",             ID_HELP_USING
+        MENUITEM SEPARATOR
+        MENUITEM "Winefile ‚ɂ‚¢‚Ä(&A)...",          ID_ABOUT
+    }
+}
+
+
+IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ŽÀs"
+FONT 8, "MS Shell Dlg"
+{
+    CONTROL         "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6,
162, 10
+    CONTROL         "ƒRƒ}ƒ“ƒh(&C):", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
+    EDITTEXT        201, 3, 29, 134, 12, ES_AUTOHSCROLL
+    CONTROL         "As &Symbol", 214, "Button",
BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12
+    DEFPUSHBUTTON   "OK", 1, 158, 6, 47, 14
+    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹", 2, 158, 23, 47, 14
+    PUSHBUTTON      "ƒwƒ‹ƒv(&H)", 254, 158, 43, 47, 14
+}
+
+IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ˆÚ“®æ‚ð‘I‘ð"
+FONT 8, "MS Shell Dlg"
+{
+    CONTROL         "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6,
162, 10
+    CONTROL         "ƒpƒX(&P):", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
+    EDITTEXT        201, 3, 29, 134, 12, ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK", 1, 158, 6, 47, 14
+    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹", 2, 158, 23, 47, 14
+    PUSHBUTTON      "ŽQÆ(&B)", 254, 158, 43, 47, 14
+}
+
+IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "By File Type"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "&Name:",-1,7,8,22,10
+    EDITTEXT        IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL
+    GROUPBOX        "File Type",-1,7,23,87,56
+    CONTROL        
"&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10
+    CONTROL         "&Programs",IDC_VIEW_TYPE_PROGRAMS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10
+    CONTROL        
"Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10
+    CONTROL         "&Other
files",IDC_VIEW_TYPE_OTHERS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10
+    CONTROL         "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9
+    DEFPUSHBUTTON   "OK",IDOK,104,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,104,24,50,14
+END
+
+IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE  0, 0, 248, 215
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Properties for %s"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,191,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,191,29,50,14
+    LTEXT           "&File Name:",-1,7,7,59,9
+    EDITTEXT        IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Full &Path:",-1,7,18,59,9
+    EDITTEXT        IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Last Change:",-1,7,29,59,9
+    EDITTEXT        IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Version:",-1,7,40,59,9
+    EDITTEXT        IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Cop&yright:",-1,7,51,59,9
+    EDITTEXT        IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Size:",-1,7,62,59,9
+    EDITTEXT        IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    GROUPBOX        "Attributes",-1,7,79,158,46
+    CONTROL         "&Read
Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9
+    CONTROL        
"H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,92,91,68,9
+    CONTROL        
"&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,17,101,68,9
+    CONTROL        
"&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,92,101,68,9
+    CONTROL         "&Compressed",IDC_CHECK_COMPRESSED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9
+    GROUPBOX        "&Version Information",-1,7,129,234,79
+    LISTBOX         IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE |
ES_READONLY | WS_VSCROLL
+END
+
+
+STRINGTABLE
+{
+    IDS_FONT_SEL_DLG_NAME   "Applying font settings"
+    IDS_FONT_SEL_ERROR      "Error while selecting new font."
+}
+
+STRINGTABLE
+{
+    IDS_WINEFILE            "Wine ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ"
+    IDS_ERROR               "Error"
+    IDS_ROOT_FS             "root fs"
+    IDS_UNIXFS              "unixfs"
+    IDS_DESKTOP             "Desktop"
+    IDS_SHELL               "ƒVƒFƒ‹"
+    IDS_TITLEFMT            "%s - %s"
+    IDS_NO_IMPL             "–¢ŽÀ‘•"
+    IDS_WINE_FILE           "Wine File"
+}
+
+STRINGTABLE
+{
+    IDS_COL_NAME            "–¼‘O"
+    IDS_COL_SIZE            "ƒTƒCƒY"
+    IDS_COL_CDATE           "CDate"
+    IDS_COL_ADATE           "ADate"
+    IDS_COL_MDATE           "MDate"
+    IDS_COL_IDX             "Index/Inode"
+    IDS_COL_LINKS           "ƒŠƒ“ƒN"
+    IDS_COL_ATTR            "‘®«"
+    IDS_COL_SEC             "ƒZƒLƒ…ƒŠƒeƒB"
+
+    IDS_FREE_SPACE_FMT      "%s of %s free"
+}

Propchange: trunk/rosapps/applications/winfile/lang/ja-JP.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/rosapps/applications/winfile/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/…
==============================================================================
--- trunk/rosapps/applications/winfile/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/winfile/lang/zh-CN.rc [iso-8859-1] Fri Sep  5 12:00:16
2008
@@ -1,8 +1,9 @@
 /*
  * WineFile
- * Simplified Chinese Language Support
+ * Simplified and Traditional Chinese Language Support
  *
  * Copyright 2002 liuspider <liuspider(a)yahoo.com>
+ * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,140 +20,283 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+/* Chinese text is encoded in UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 /* Menu */
 
 IDM_WINEFILE MENU FIXED IMPURE
 {
-    POPUP "Îļþ£¨&F£©"  {
-        MENUITEM "´ò¿ª£¨&O£©\tEnter",           ID_ACTIVATE
-        MENUITEM "Òƶ¯£¨&M£©...\tF7",           ID_FILE_MOVE
-        MENUITEM "¸´ÖÆ£¨&C£©...\tF8",           ID_FILE_COPY
-        MENUITEM "λÓÚ¼ôÌù°å£¨&I£©...\tF9",     118
-        MENUITEM "ɾ³ý£¨&D£©\tDel",             ID_FILE_DELETE
-        MENUITEM "¸ÄÃû£¨&N£©...",               109
-        MENUITEM "ÊôÐÔ£¨&I£©...\tAlt+Enter",    ID_EDIT_PROPERTIES
-        MENUITEM SEPARATOR
-        MENUITEM "ѹËõ£¨&O£©...",               119
-        MENUITEM "½âѹËõ£¨&O£©...",             120
-        MENUITEM SEPARATOR
-        MENUITEM "ÔËÐУ¨&R£©...",               ID_EXECUTE
-        MENUITEM "´òÓ¡£¨&P£©...",               102
-        MENUITEM "ÅäÖÃÎļþÏà¹Ø...",             103
-        MENUITEM SEPARATOR
-        MENUITEM "½¨Á¢Ä¿Â¼£¨&E£©...",           111
-        MENUITEM "²éÕÒ£¨&H£©...",               104
-        MENUITEM "Ñ¡ÔñÎļþ£¨&S£©...",           116
-        MENUITEM SEPARATOR
-#ifndef _NO_EXTENSIONS
-        MENUITEM "Í˳ö£¨&X£©\tAlt+X",           ID_FILE_EXIT
+    POPUP "文件(&F)"  {
+        MENUITEM "打开(&O)\tEnter",           ID_ACTIVATE
+        MENUITEM "移动(&M)...\tF7",           ID_FILE_MOVE
+        MENUITEM "复制(&C)...\tF8",           ID_FILE_COPY
+        MENUITEM "位于剪贴板(&I)...\tF9",     118
+        MENUITEM "åˆ é™¤(&D)\tDel",             ID_FILE_DELETE
+        MENUITEM "改名(&N)...",               109
+        MENUITEM "属性(&I)...\tAlt+Enter",    ID_EDIT_PROPERTIES
+        MENUITEM SEPARATOR
+        MENUITEM "压缩(&O)...",               119
+        MENUITEM "解压缩(&O)...",             120
+        MENUITEM SEPARATOR
+        MENUITEM "运行(&R)...",               ID_EXECUTE
+        MENUITEM "打印(&P)...",               102
+        MENUITEM "配置文件相关...",             103
+        MENUITEM SEPARATOR
+        MENUITEM "建立目录(&E)...",           111
+        MENUITEM "查找(&H)...",               104
+        MENUITEM "选择文件(&S)...",           116
+        MENUITEM SEPARATOR
+#ifndef _NO_EXTENSIONS
+        MENUITEM "退出(&X)\tAlt+X",           ID_FILE_EXIT
 #else
-        MENUITEM "Í˳ö£¨&X£©",                  ID_FILE_EXIT
-#endif
-    }
-
-    POPUP "´ÅÅÌ£¨&D£©"  {
-        MENUITEM "¸´ÖÆ£¨&C£©...",               201
-        MENUITEM "ÃüÃû£¨&L£©...",               202
-        MENUITEM SEPARATOR
-        MENUITEM "¸ñʽ»¯£¨&£©...",              ID_FORMAT_DISK
+        MENUITEM "退出(&X)",                  ID_FILE_EXIT
+#endif
+    }
+
+    POPUP "磁盘(&D)"  {
+        MENUITEM "复制(&C)...",               201
+        MENUITEM "命名(&L)...",               202
+        MENUITEM SEPARATOR
+        MENUITEM "æ ¼å¼åŒ–(&)...",              ID_FORMAT_DISK
 #ifdef _WIN95
-        MENUITEM "½¨Á¢ÏµÍ³ÅÌ£¨&M£©...", -1  /*TODO*/
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "Á¬½ÓÍøÂçÇý¶¯Æ÷£¨&N£©",        ID_CONNECT_NETWORK_DRIVE
-        MENUITEM "¶Ï¿ªÍøÂçÇý¶¯Æ÷Á¬½Ó£¨&D£©",   
ID_DISCONNECT_NETWORK_DRIVE
-        MENUITEM SEPARATOR
-        MENUITEM "¹²ÏíΪ...",                   254
-        MENUITEM "ɾ³ý¹²Ïí£¨&R£©...",           255
-        MENUITEM SEPARATOR
-        MENUITEM "Ñ¡ÔñÇý¶¯Æ÷£¨&S£©...",         251
-    }
-
-    POPUP "Ŀ¼£¨&D£©"  {
-        MENUITEM "ÏÂÒ»²ã£¨&N£©\t+",             301
-        MENUITEM "Õ¹¿ª£¨&T£©\t*",               302
-        MENUITEM "È«²¿Õ¹¿ª£¨&A£©\tStrg+*",      303
-        MENUITEM "ÕÛµþ£¨&R£©\t-",               304
-        MENUITEM SEPARATOR
-        MENUITEM "±ê¼Ç×ÓĿ¼£¨&M£©",            505
-    }
-
-    POPUP "ÊÓͼ£¨&V£©"  {
-        MENUITEM "Ŀ¼Ê÷»úÆ÷ÄÚÈÝ£¨&R£©",        413
-        MENUITEM "½öÏÔʾĿ¼Ê÷£¨&E£©",          411
-        MENUITEM "½öÏÔʾĿ¼ÄÚÈÝ£¨&O£©",        412
-        MENUITEM SEPARATOR
-        MENUITEM "·Ö¸î£¨&L£©",                  ID_VIEW_SPLIT
-        MENUITEM SEPARATOR
-        MENUITEM "ÎļþÃûÃû£¨&N£©",              ID_VIEW_NAME
-        MENUITEM "ÎļþÏêϤÁÐ±í£¨&A£©",          ID_VIEW_ALL_ATTRIBUTES,
CHECKED
-        MENUITEM "²¿·ÖÊôÐÔ£¨&P£©...",          
ID_VIEW_SELECTED_ATTRIBUTES
-        MENUITEM SEPARATOR
-        MENUITEM "°´ÎļþÃûÅÅÐò£¨&S£©",          ID_VIEW_SORT_NAME
-        MENUITEM "°´ÀàÐÍÅÅÐò£¨&B£©",            ID_VIEW_SORT_TYPE
-        MENUITEM "°´´óСÅÅÐò£¨&Z£©",            ID_VIEW_SORT_SIZE
-        MENUITEM "°´ÈÕÆÚÅÅÐò£¨&D£©",            ID_VIEW_SORT_DATE
-        MENUITEM SEPARATOR
-        MENUITEM "¶¨ÖÆÅÅÐò...",                 ID_VIEW_FILTER
-    }
-
-    POPUP "Ñ¡Ï&O£©"  {
-        MENUITEM "È·¶¨·½Ê½£¨&C£©...",           501
-        MENUITEM "×ÖÌ壨&F£©...",               ID_SELECT_FONT
-        MENUITEM "¶¨Öƹ¤¾ßÌõ£¨&B£©...",         512
-        MENUITEM SEPARATOR
-        MENUITEM "¹¤¾ßÌõ£¨&T£©",                ID_VIEW_TOOL_BAR, CHECKED
-        MENUITEM "Çý¶¯Æ÷ÁÐ±í£¨&D£©",            ID_VIEW_DRIVE_BAR, CHECKED
-        MENUITEM "״̬À¸£¨&S£©",                ID_VIEW_STATUSBAR, CHECKED
-#ifndef _NO_EXTENSIONS
-        MENUITEM "È«ÆÁ£¨&U£©\tCtrl+Shift+S",    ID_VIEW_FULLSCREEN
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Minimize on run",            504
-        MENUITEM "&Save settings on exit",      511
-    }
-
-
-    POPUP "°²È«£¨&S£©"  {
-        MENUITEM "·ÃÎÊ£¨&A£©...",               605
-        MENUITEM "µÇ¼£¨&L£©...",               606
-        MENUITEM "ËùÓÐÕߣ¨&O£©...",             607
-    }
-
-    POPUP "´°¿Ú£¨&W£©"  {
-        MENUITEM "н¨£¨&W)",                   ID_WINDOW_NEW
-        MENUITEM "²ãµþ\tCtrl+F5",               ID_WINDOW_CASCADE
-        MENUITEM "ˮƽƽÆÌ£¨&H£©",              ID_WINDOW_TILE_HORZ
-        MENUITEM "´¹Ö±Æ½ÆÌ£¨&£©\tCtrl+F4",      ID_WINDOW_TILE_VERT
-#ifndef _NO_EXTENSIONS
-        MENUITEM "×Ô¶¯ÅÅÁÐ",                    ID_WINDOW_AUTOSORT
-#endif
-        MENUITEM "×Ô¶¯ÅÅÁÐͼ±ê£¨&S£©",          ID_WINDOW_ARRANGE
-        MENUITEM "ˢУ¨&R£©\tF5",              ID_REFRESH
+        MENUITEM "建立系统盘(&M)...", -1  /*TODO*/
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "连接网络驱动器(&N)",       
ID_CONNECT_NETWORK_DRIVE
+        MENUITEM "断开网络驱动器连接(&D)",   
ID_DISCONNECT_NETWORK_DRIVE
+        MENUITEM SEPARATOR
+        MENUITEM "共享为...",                   254
+        MENUITEM "åˆ é™¤å…±äº«(&R)...",           255
+        MENUITEM SEPARATOR
+        MENUITEM "选择驱动器(&S)...",         251
+    }
+
+    POPUP "目录(&D)"  {
+        MENUITEM "下一层(&N)\t+",             301
+        MENUITEM "展开(&T)\t*",               302
+        MENUITEM "全部展开(&A)\tStrg+*",      303
+        MENUITEM "æŠ˜å (&R)\t-",               304
+        MENUITEM SEPARATOR
+        MENUITEM "æ ‡è®°å­ç›®å½•(&M)",            505
+    }
+
+    POPUP "视图(&V)"  {
+        MENUITEM "ç›®å½•æ ‘æœºå™¨å†…å®¹(&R)",        413
+        MENUITEM "ä»…æ˜¾ç¤ºç›®å½•æ ‘(&E)",          411
+        MENUITEM "仅显示目录内容(&O)",        412
+        MENUITEM SEPARATOR
+        MENUITEM "分割(&L)",                  ID_VIEW_SPLIT
+        MENUITEM SEPARATOR
+        MENUITEM "文件名称(&N)",              ID_VIEW_NAME
+        MENUITEM "文件详情列表(&A)",          ID_VIEW_ALL_ATTRIBUTES, CHECKED
+        MENUITEM "部分属性(&P)...",          
ID_VIEW_SELECTED_ATTRIBUTES
+        MENUITEM SEPARATOR
+        MENUITEM "按文件名排序(&S)",          ID_VIEW_SORT_NAME
+        MENUITEM "按类型排序(&B)",            ID_VIEW_SORT_TYPE
+        MENUITEM "按大小排序(&Z)",            ID_VIEW_SORT_SIZE
+        MENUITEM "按日期排序(&D)",            ID_VIEW_SORT_DATE
+        MENUITEM SEPARATOR
+        MENUITEM "定制排序...",                 ID_VIEW_FILTER
+    }
+
+    POPUP "选项(&O)"  {
+        MENUITEM "确定方式(&C)...",           501
+        MENUITEM "字体(&F)...",               ID_SELECT_FONT
+        MENUITEM "定制工具条(&B)...",         512
+        MENUITEM SEPARATOR
+        MENUITEM "工具条(&T)",                ID_VIEW_TOOL_BAR, CHECKED
+        MENUITEM "驱动器列表(&D)",            ID_VIEW_DRIVE_BAR,
CHECKED
+        MENUITEM "çŠ¶æ€æ (&S)",                ID_VIEW_STATUSBAR,
CHECKED
+#ifndef _NO_EXTENSIONS
+        MENUITEM "全屏(&U)\tCtrl+Shift+S",    ID_VIEW_FULLSCREEN
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "启动后最小化(&M)",          504
+        MENUITEM "退出时保存设置(&S)",        511
+    }
+
+
+    POPUP "安全(&S)"  {
+        MENUITEM "访问(&A)...",               605
+        MENUITEM "登录(&L)...",               606
+        MENUITEM "所有者(&O)...",             607
+    }
+
+    POPUP "窗口(&W)"  {
+        MENUITEM "新建(&W)",                   ID_WINDOW_NEW
+        MENUITEM "å±‚å \tCtrl+F5",               ID_WINDOW_CASCADE
+        MENUITEM "水平平铺(&H)",              ID_WINDOW_TILE_HORZ
+        MENUITEM "垂直平铺(&)\tCtrl+F4",      ID_WINDOW_TILE_VERT
+#ifndef _NO_EXTENSIONS
+        MENUITEM "自动排列",                    ID_WINDOW_AUTOSORT
+#endif
+        MENUITEM "è‡ªåŠ¨æŽ’åˆ—å›¾æ ‡(&S)",          ID_WINDOW_ARRANGE
+        MENUITEM "刷新(&R)\tF5",              ID_REFRESH
     }
 
     POPUP "&?"  {
-        MENUITEM "°ïÖúÖ÷Ì⣨&H£©\tF1",          ID_HELP
-        MENUITEM "ËÑË÷°ïÖú£¨&S£©...\tF1",       ID_HELP
-        MENUITEM "ʹÓðïÖú£¨&U£©\tF1",          ID_HELP_USING
-        MENUITEM SEPARATOR
-        MENUITEM "&¹ØÓÚ Winefile...",           ID_ABOUT
+        MENUITEM "帮助主题(&H)\tF1",          ID_HELP
+        MENUITEM "搜索帮助(&S)...\tF1",       ID_HELP
+        MENUITEM "使用帮助(&U)\tF1",          ID_HELP_USING
+        MENUITEM SEPARATOR
+        MENUITEM "&关于 Winefile...",           ID_ABOUT
     }
 }
 
 
 IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ÔËÐÐ"
+CAPTION "运行"
 FONT 8, "MS Shell Dlg"
 {
     CONTROL         "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6,
162, 10
-    CONTROL         "ÃüÁ&C£©£º", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
+    CONTROL         "命令(&C):", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
     EDITTEXT        201, 3, 29, 134, 12, ES_AUTOHSCROLL
-    CONTROL         "×÷ΪÁ¬½Ó£¨&S£©", 214, "Button",
BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12
-    DEFPUSHBUTTON   "È·¶¨", 1, 158, 6, 47, 14
-    PUSHBUTTON      "È¡Ïû", 2, 158, 23, 47, 14
-    PUSHBUTTON      "°ïÖú£¨&H£©", 254, 158, 43, 47, 14
+    CONTROL         "作为连接(&S)", 214, "Button",
BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12
+    DEFPUSHBUTTON   "确定", 1, 158, 6, 47, 14
+    PUSHBUTTON      "取消", 2, 158, 23, 47, 14
+    PUSHBUTTON      "帮助(&H)", 254, 158, 43, 47, 14
 }
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
+
+/* Menu */
+
+IDM_WINEFILE MENU FIXED IMPURE
+{
+    POPUP "檔案(&F)"  {
+        MENUITEM "開啟(&O)\tEnter",           ID_ACTIVATE
+        MENUITEM "移動(&M)...\tF7",           ID_FILE_MOVE
+        MENUITEM "複製(&C)...\tF8",           ID_FILE_COPY
+        MENUITEM "位於剪貼板(&I)...\tF9",     118
+        MENUITEM "刪除(&D)\tDel",             ID_FILE_DELETE
+        MENUITEM "改名(&N)...",               109
+        MENUITEM "屬性(&I)...\tAlt+Enter",    ID_EDIT_PROPERTIES
+        MENUITEM SEPARATOR
+        MENUITEM "壓縮(&O)...",               119
+        MENUITEM "解壓縮(&O)...",             120
+        MENUITEM SEPARATOR
+        MENUITEM "執行(&R)...",               ID_EXECUTE
+        MENUITEM "列印(&P)...",               102
+        MENUITEM "配置檔案相關...",             103
+        MENUITEM SEPARATOR
+        MENUITEM "建立目錄(&E)...",           111
+        MENUITEM "查找(&H)...",               104
+        MENUITEM "選擇檔案(&S)...",           116
+        MENUITEM SEPARATOR
+#ifndef _NO_EXTENSIONS
+        MENUITEM "結束(&X)\tAlt+X",           ID_FILE_EXIT
+#else
+        MENUITEM "結束(&X)",                  ID_FILE_EXIT
+#endif
+    }
+
+    POPUP "磁盤(&D)"  {
+        MENUITEM "複製(&C)...",               201
+        MENUITEM "命名(&L)...",               202
+        MENUITEM SEPARATOR
+        MENUITEM "æ ¼å¼åŒ–(&)...",              ID_FORMAT_DISK
+#ifdef _WIN95
+        MENUITEM "建立系統盤(&M)...", -1  /*TODO*/
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "連接網路儲存槽(&N)",       
ID_CONNECT_NETWORK_DRIVE
+        MENUITEM "斷開網路儲存槽連接(&D)",   
ID_DISCONNECT_NETWORK_DRIVE
+        MENUITEM SEPARATOR
+        MENUITEM "共享為...",                   254
+        MENUITEM "刪除共享(&R)...",           255
+        MENUITEM SEPARATOR
+        MENUITEM "選擇儲存槽(&S)...",         251
+    }
+
+    POPUP "目錄(&D)"  {
+        MENUITEM "下一層(&N)\t+",             301
+        MENUITEM "展開(&T)\t*",               302
+        MENUITEM "全部展開(&A)\tStrg+*",      303
+        MENUITEM "折疊(&R)\t-",               304
+        MENUITEM SEPARATOR
+        MENUITEM "標記子目錄(&M)",            505
+    }
+
+    POPUP "檢視(&V)"  {
+        MENUITEM "目錄樹機器內容(&R)",        413
+        MENUITEM "僅顯示目錄樹(&E)",          411
+        MENUITEM "僅顯示目錄內容(&O)",        412
+        MENUITEM SEPARATOR
+        MENUITEM "分割(&L)",                  ID_VIEW_SPLIT
+        MENUITEM SEPARATOR
+        MENUITEM "檔案名稱(&N)",              ID_VIEW_NAME
+        MENUITEM "檔案詳情列表(&A)",          ID_VIEW_ALL_ATTRIBUTES, CHECKED
+        MENUITEM "部分屬性(&P)...",          
ID_VIEW_SELECTED_ATTRIBUTES
+        MENUITEM SEPARATOR
+        MENUITEM "按檔案名排列(&S)",          ID_VIEW_SORT_NAME
+        MENUITEM "按類型排列(&B)",            ID_VIEW_SORT_TYPE
+        MENUITEM "按大小排列(&Z)",            ID_VIEW_SORT_SIZE
+        MENUITEM "按日期排列(&D)",            ID_VIEW_SORT_DATE
+        MENUITEM SEPARATOR
+        MENUITEM "定製排列...",                 ID_VIEW_FILTER
+    }
+
+    POPUP "é¸é …(&O)"  {
+        MENUITEM "確定方式(&C)...",           501
+        MENUITEM "字型(&F)...",               ID_SELECT_FONT
+        MENUITEM "定製工具條(&B)...",         512
+        MENUITEM SEPARATOR
+        MENUITEM "工具條(&T)",                ID_VIEW_TOOL_BAR, CHECKED
+        MENUITEM "儲存槽列表(&D)",            ID_VIEW_DRIVE_BAR,
CHECKED
+        MENUITEM "狀態欄(&S)",                ID_VIEW_STATUSBAR, CHECKED
+#ifndef _NO_EXTENSIONS
+        MENUITEM "全屏(&U)\tCtrl+Shift+S",    ID_VIEW_FULLSCREEN
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "啟動後最小化(&M)",          504
+        MENUITEM "結束時儲存設定(&S)",        511
+    }
+
+
+    POPUP "安全(&S)"  {
+        MENUITEM "訪問(&A)...",               605
+        MENUITEM "登錄(&L)...",               606
+        MENUITEM "所有者(&O)...",             607
+    }
+
+    POPUP "窗口(&W)"  {
+        MENUITEM "新建(&W)",                   ID_WINDOW_NEW
+        MENUITEM "層疊\tCtrl+F5",               ID_WINDOW_CASCADE
+        MENUITEM "水平平鋪(&H)",              ID_WINDOW_TILE_HORZ
+        MENUITEM "垂直平鋪(&)\tCtrl+F4",      ID_WINDOW_TILE_VERT
+#ifndef _NO_EXTENSIONS
+        MENUITEM "自動排列",                    ID_WINDOW_AUTOSORT
+#endif
+        MENUITEM "自動排列圖標(&S)",          ID_WINDOW_ARRANGE
+        MENUITEM "刷新(&R)\tF5",              ID_REFRESH
+    }
+
+    POPUP "&?"  {
+        MENUITEM "幫助主題(&H)\tF1",          ID_HELP
+        MENUITEM "搜索幫助(&S)...\tF1",       ID_HELP
+        MENUITEM "使用幫助(&U)\tF1",          ID_HELP_USING
+        MENUITEM SEPARATOR
+        MENUITEM "&關於 Winefile...",           ID_ABOUT
+    }
+}
+
+
+IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "執行"
+FONT 8, "PMingLiu"
+{
+    CONTROL         "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6,
162, 10
+    CONTROL         "指令(&C):", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
+    EDITTEXT        201, 3, 29, 134, 12, ES_AUTOHSCROLL
+    CONTROL         "作為連接(&S)", 214, "Button",
BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12
+    DEFPUSHBUTTON   "確定", 1, 158, 6, 47, 14
+    PUSHBUTTON      "取消", 2, 158, 23, 47, 14
+    PUSHBUTTON      "幫助(&H)", 254, 158, 43, 47, 14
+}
+
+#pragma code_page(default)

Modified: trunk/rosapps/applications/winfile/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.…
==============================================================================
--- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Fri Sep  5 12:00:16 2008
@@ -63,6 +63,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/hu-HU.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

Modified: trunk/rosapps/applications/winfile/winefile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef…
==============================================================================
--- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Fri Sep  5 12:00:16 2008
@@ -867,20 +867,14 @@
 static LPITEMIDLIST get_to_absolute_pidl(Entry* entry, HWND hwnd)
 {
 	if (entry->up && entry->up->etype==ET_SHELL) {
-		IShellFolder* folder = entry->up->folder;
-		WCHAR buffer[MAX_PATH];
-
-		HRESULT hr = path_from_pidlW(folder, entry->pidl, buffer, MAX_PATH);
-
-		if (SUCCEEDED(hr)) {
-			LPITEMIDLIST pidl;
-			ULONG len;
-
-			hr = IShellFolder_ParseDisplayName(Globals.iDesktop, hwnd, NULL, buffer, &len,
&pidl, NULL);
-
-			if (SUCCEEDED(hr))
-				return pidl;
+		LPITEMIDLIST idl = NULL;
+
+		while (entry->up) {
+			idl = ILCombine(ILClone(entry->pidl), idl);
+			entry = entry->up;
 		}
+
+		return idl;
 	} else if (entry->etype == ET_WINDOWS) {
 		TCHAR path[MAX_PATH];
 
@@ -2708,7 +2702,7 @@
 	SendMessage(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0);
 
 	/* no change? */
-	if (!memcmp(orgWidths, pane->widths, sizeof(orgWidths)))
+	if (!anyway && !memcmp(orgWidths, pane->widths, sizeof(orgWidths)))
 		return FALSE;
 
 	/* don't move, if only collapsing an entry */

Modified: trunk/rosapps/applications/write/write.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/write.c…
==============================================================================
--- trunk/rosapps/applications/write/write.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/write/write.c [iso-8859-1] Fri Sep  5 12:00:16 2008
@@ -40,7 +40,7 @@
 	lstrcatW(path, SZ_BACKSLASH);
     lstrcatW(path, SZ_WORDPAD);
 
-    stinf.cb = sizeof(STARTUPINFO);
+    stinf.cb = sizeof(STARTUPINFOW);
     GetStartupInfoW(&stinf);
 
     if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL,
&stinf, &info))
@@ -48,7 +48,7 @@
     return 0;
 
 failed:
-    LoadStringW(GetModuleHandle(NULL), IDS_FAILED, path, MAX_PATH);
+    LoadStringW(GetModuleHandleW(NULL), IDS_FAILED, path, MAX_PATH);
     MessageBoxW(NULL, path, NULL, MB_OK|MB_ICONERROR);
     return 1;
 }