Author: dreimer Date: Tue Oct 14 08:44:12 2008 New Revision: 36745
URL: http://svn.reactos.org/svn/reactos?rev=36745&view=rev Log: Sync winfile and write to wine HEAD.
Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/write/lang/ja-JP.rc
Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/j... ============================================================================== --- trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] Tue Oct 14 08:44:12 2008 @@ -21,155 +21,158 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+/* UTF-8 */ +#pragma code_page(65001) + 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 "Rs[(&C)...\tF8", ID_FILE_COPY + POPUP "ãã¡ã¤ã«(&F)" { + MENUITEM "éã(&O)\tEnter", ID_ACTIVATE + MENUITEM "移å(&M)...\tF7", ID_FILE_MOVE + MENUITEM "ã³ãã¼(&C)...\tF8", ID_FILE_COPY MENUITEM "&In Clipboard...\tF9", 118 - MENUITEM "í(&D)\tDel", ID_FILE_DELETE - MENUITEM "¼OÌÏX(&N)...", 109 - MENUITEM "vpeB(&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 "ÖAt¯...", 103 - MENUITEM SEPARATOR - MENUITEM "fBNgðì¬(&E)...", 111 - MENUITEM "õ(&H)...", 104 - MENUITEM "t@CðIð(&S)...", 116 + 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 "I¹(&X)\tAlt+X", ID_FILE_EXIT + MENUITEM "çµäº(&X)\tAlt+X", ID_FILE_EXIT #else - MENUITEM "I¹(&X)", ID_FILE_EXIT -#endif - } - - POPUP "fBXN(&D)" { - MENUITEM "fBXNðRs[(&C)...", 201 + MENUITEM "çµäº(&X)", ID_FILE_EXIT +#endif + } + + POPUP "ãã£ã¹ã¯(&D)" { + MENUITEM "ãã£ã¹ã¯ãã³ãã¼(&C)...", 201 MENUITEM "&Label Disk...", 202 MENUITEM SEPARATOR - MENUITEM "fBXNðtH[}bg(&F)...", ID_FORMAT_DISK + MENUITEM "ãã£ã¹ã¯ããã©ã¼ããã(&F)...", ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Make System Disk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "lbg[NhCuÉÚ±(&N)", ID_CONNECT_NETWORK_DRIVE - MENUITEM "lbg[NhCuðØf(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "ãããã¯ã¼ã¯ãã©ã¤ãã«æ¥ç¶(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "ãããã¯ã¼ã¯ãã©ã¤ããåæ(&D)", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Share as...", 254 MENUITEM "&Remove Share...", 255 MENUITEM SEPARATOR - MENUITEM "hCuðIð(&S)...", 251 - } - - POPUP "fBNg(&R)" { + MENUITEM "ãã©ã¤ããé¸æ(&S)...", 251 + } + + POPUP "ãã£ã¬ã¯ããª(&R)" { MENUITEM "&Next Level\t+", 301 - MENUITEM "c[ðWJ(&T)\t*", 302 - MENUITEM "·×ÄðWJ(&A)\tStrg+*", 303 - MENUITEM "c[ðÜèôÞ(&T)\t-", 304 + MENUITEM "ããªã¼ãå±é(&T)\t*", 302 + MENUITEM "ãã¹ã¦ãå±é(&A)\tStrg+*", 303 + MENUITEM "ããªã¼ãæãç³ã(&T)\t-", 304 MENUITEM SEPARATOR MENUITEM "&Mark Children", 505 }
- POPUP "\¦(&V)" { - MENUITEM "c[ÆfBNg(&R)", 413 - MENUITEM "c[ÌÝ(&E)", 411 - MENUITEM "fBNgÌÝ(&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 "TCYÅÀ×Ö¦(&Z)", ID_VIEW_SORT_SIZE - MENUITEM "útÅÀ×Ö¦(&D)", ID_VIEW_SORT_DATE + 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 "Filter by &...", ID_VIEW_FILTER }
- POPUP "IvV(&O)" { - MENUITEM "mF(&C)...", 501 - MENUITEM "tHg(&F)...", ID_SELECT_FONT - MENUITEM "c[o[ðJX^}CY(&B)...", 512 - MENUITEM SEPARATOR - MENUITEM "c[o[(&T)", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "hCuo[(&D)", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Xe[^Xo[(&S)", ID_VIEW_STATUSBAR, CHECKED + 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 "SæÊ\¦(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "å ¨ç»é¢è¡¨ç¤º(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "&Minimize on run", 504 - MENUITEM "I¹ÉÝèðÛ¶(&S)", ID_VIEW_SAVESETTINGS - } - - - POPUP "ZL eB(&S)" { + MENUITEM "çµäºæã«è¨å®ãä¿å(&S)", ID_VIEW_SAVESETTINGS + } + + + POPUP "ã»ãã¥ãªãã£(&S)" { MENUITEM "&Access...", 605 MENUITEM "&Logging...", 606 MENUITEM "&Owner...", 607 }
- POPUP "EBhE(&W)" { - MENUITEM "VKEBhE(&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 + POPUP "ã¦ã£ã³ãã¦(&W)" { + MENUITEM "æ°è¦ã¦ã£ã³ãã¦(&W)", ID_WINDOW_NEW + MENUITEM "éãã¦è¡¨ç¤º\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT #endif MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE - MENUITEM "XV(&R)\tF5", ID_REFRESH - } - - POPUP "wv(&H)" { - MENUITEM "wv gsbN(&H)\tF1", ID_HELP - MENUITEM "wvÌõ(&S)...\tF1", ID_HELP - MENUITEM "wvðg¤(&U)\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Winefile É¢Ä(&A)...", ID_ABOUT + MENUITEM "æ´æ°(&R)\tF5", ID_REFRESH + } + + POPUP "ãã«ã(&H)" { + MENUITEM "ãã«ã ãããã¯(&H)\tF1", ID_HELP + MENUITEM "ãã«ãã®æ¤ç´¢(&S)...\tF1", ID_HELP + MENUITEM "ãã«ãã使ã(&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" +CAPTION "å®è¡" FONT 9, "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 + CONTROL "ã³ãã³ã(&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 "LZ", 2, 158, 23, 47, 14 - PUSHBUTTON "wv(&H)", 254, 158, 43, 47, 14 + PUSHBUTTON "ãã£ã³ã»ã«", 2, 158, 23, 47, 14 + PUSHBUTTON "ãã«ã(&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ð" +CAPTION "移åå ãé¸æ" FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "pX(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "ãã¹(&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 "LZ", 2, 158, 23, 47, 14 - PUSHBUTTON "QÆ(&B)", 254, 158, 43, 47, 14 + PUSHBUTTON "ãã£ã³ã»ã«", 2, 158, 23, 47, 14 + PUSHBUTTON "åç §(&B)", 254, 158, 43, 47, 14 }
IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 @@ -233,28 +236,30 @@
STRINGTABLE { - IDS_WINEFILE "Wine t@C}l[W" + IDS_WINEFILE "Wine ãã¡ã¤ã«ããã¼ã¸ã£" IDS_ERROR "Error" IDS_ROOT_FS "root fs" IDS_UNIXFS "unixfs" IDS_DESKTOP "Desktop" - IDS_SHELL "VF" + IDS_SHELL "ã·ã§ã«" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "¢À" + IDS_NO_IMPL "æªå®è£ " IDS_WINE_FILE "Wine File" }
STRINGTABLE { - IDS_COL_NAME "¼O" - IDS_COL_SIZE "TCY" + IDS_COL_NAME "åå" + IDS_COL_SIZE "ãµã¤ãº" 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 "ZL eB" + IDS_COL_LINKS "ãªã³ã¯" + IDS_COL_ATTR "å±æ§" + IDS_COL_SEC "ã»ãã¥ãªãã£"
IDS_FREE_SPACE_FMT "%s of %s free" } + +#pragma code_page(default)
Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winefi... ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Tue Oct 14 08:44:12 2008 @@ -964,7 +964,7 @@ ((LPITEMIDLIST)((LPBYTE)next_pidl+pidl->mkid.cb))->mkid.cb = 0;
hr = IShellFolder_BindToObject(folder, next_pidl, 0, &IID_IShellFolder, (void**)&child); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) break;
read_directory(entry, NULL, sortOrder, hwnd); @@ -1070,7 +1070,7 @@ memset(pidls, 0, sizeof(pidls));
hr = IEnumIDList_Next(idlist, FETCH_ITEM_COUNT, pidls, &cnt); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) break;
if (hr == S_FALSE)
Modified: trunk/rosapps/applications/write/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/ja-... ============================================================================== --- trunk/rosapps/applications/write/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/lang/ja-JP.rc [iso-8859-1] Tue Oct 14 08:44:12 2008 @@ -18,9 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE { - IDS_FAILED, "Wordpad ÌN®É¸sµÜµ½" + IDS_FAILED, "Wordpad ã®èµ·åã«å¤±æãã¾ãã" } + +#pragma code_page(default)
-
dreimer＠svn.reactos.org