[ros-diffs] [dreimer] 36745: Sync winfile and write to wine HEAD.

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/…
==============================================================================
--- 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 "ƒRƒs[(&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 "ƒ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 "削除(&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 "ƒfƒBƒXƒN(&D)"  {
-        MENUITEM "ƒfƒBƒXƒN‚ðƒRƒs[(&C)...",               201
+        MENUITEM "終了(&X)",                       ID_FILE_EXIT
+#endif
+    }
+
+    POPUP "ディスク(&D)"  {
+        MENUITEM "ディスクをコピー(&C)...",               201
         MENUITEM "&Label Disk...",              202
         MENUITEM SEPARATOR
-        MENUITEM "ƒfƒBƒXƒN‚ðƒtƒH[ƒ}ƒbƒg(&F)...",
ID_FORMAT_DISK
+        MENUITEM "ディスクをフォーマット(&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 "ネットワークドライブに接続(&N)",
ID_CONNECT_NETWORK_DRIVE
+        MENUITEM "ネットワークドライブを切断(&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 "ドライブを選択(&S)...",            251
+    }
+
+    POPUP "ディレクトリ(&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 "ツリーを展開(&T)\t*",             302
+        MENUITEM "すべてを展開(&A)\tStrg+*",         303
+        MENUITEM "ツリーを折り畳む(&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
+    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 "ƒ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
+    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 "ƒZƒLƒ…
ƒŠƒeƒB(&S)"  {
+        MENUITEM "終了時に設定を保存(&S)",
ID_VIEW_SAVESETTINGS
+    }
+
+
+    POPUP "セキュリティ(&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
+    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 "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
+        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      "ƒLƒƒƒ“ƒZƒ‹", 2, 158, 23, 47, 14
-    PUSHBUTTON      "ƒwƒ‹ƒv(&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         "ƒpƒX(&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      "ƒLƒƒƒ“ƒZƒ‹", 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               "ƒVƒFƒ‹"
+    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            "ƒTƒCƒY"
+    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             "ƒZƒLƒ…
ƒŠƒeƒB"
+    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/winef…
==============================================================================
--- 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)