<div>From d40fc631ec0ba590a32e68cadb608162024b9c0b Mon Sep 17 00:00:00 2001</div><div>Message-Id: <<a href="mailto:d40fc631ec0ba590a32e68cadb608162024b9c0b.1370701497.git.matyapiro31@gmail.com">d40fc631ec0ba590a32e68cadb608162024b9c0b.1370701497.git.matyapiro31@gmail.com</a>></div>
<div>From: Akira <<a href="mailto:matyapiro31@gmail.com">matyapiro31@gmail.com</a>></div><div>Date: Sat, 8 Jun 2013 23:24:08 +0900</div><div>Subject: [PATCH] change all by once</div><div><br></div><div>---</div><div>
dlls/ole32/compobj.c | 4 ++</div><div> dlls/winhttp/session.c | 2 +</div><div> po/ja.po | 162 +++++++++++++++++++++++--------------------------</div><div> tools/wine.desktop | 1 +</div><div> 4 files changed, 84 insertions(+), 85 deletions(-)</div>
<div><br></div><div>diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c</div><div>index 92ace8a..d7fb6c2 100644</div><div>--- a/dlls/ole32/compobj.c</div><div>+++ b/dlls/ole32/compobj.c</div><div>@@ -2823,8 +2823,12 @@ HRESULT WINAPI CoGetClassObject(</div>
<div> }</div><div> </div><div> if (FAILED(hres))</div><div>+ {</div><div> ERR("no class object %s could be created for context 0x%x\n",</div><div> debugstr_guid(rclsid), dwClsContext);</div>
<div>+ if(hres == NULL)</div><div>+ hres = E_NOINTERFACE;</div><div>+ }</div><div> return hres;</div><div> }</div><div> </div><div>diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c</div>
<div>index 660eae5..dfe23d4 100644</div><div>--- a/dlls/winhttp/session.c</div><div>+++ b/dlls/winhttp/session.c</div><div>@@ -1316,6 +1316,8 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url )</div>
<div> {</div><div> static int fixme_shown;</div><div> if (!fixme_shown++) FIXME("discovery via DHCP not supported\n");</div><div>+ flags = WINHTTP_AUTO_DETECT_TYPE_DNS_A;</div><div>+ ret=TRUE;</div>
<div> }</div><div> if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A)</div><div> {</div><div>diff --git a/po/ja.po b/po/ja.po</div><div>index 9ca1496..92c5503 100644</div><div>--- a/po/ja.po</div><div>+++ b/po/ja.po</div>
<div>@@ -5,13 +5,14 @@ msgstr ""</div><div> "Project-Id-Version: Wine\n"</div><div> "Report-Msgid-Bugs-To: <a href="http://bugs.winehq.org">http://bugs.winehq.org</a>\n"</div><div> "POT-Creation-Date: N/A\n"</div>
<div>-"PO-Revision-Date: 2013-01-17 20:12+0900\n"</div><div>-"Last-Translator: Akihiro Sagawa <<a href="mailto:sagawa.aki@gmail.com">sagawa.aki@gmail.com</a>>\n"</div><div>+"PO-Revision-Date: 2013-06-08 19:47+0900\n"</div>
<div>+"Last-Translator: Matyapiro <<a href="mailto:matyapiro31@yahoo.co.jp">matyapiro31@yahoo.co.jp</a>>\n"</div><div> "Language-Team: none\n"</div><div> "Language: Japanese\n"</div><div>
"MIME-Version: 1.0\n"</div><div> "Content-Type: text/plain; charset=UTF-8\n"</div><div> "Content-Transfer-Encoding: 8bit\n"</div><div>+"X-Generator: Poedit 1.5.4\n"</div><div> </div>
<div> #: appwiz.rc:55</div><div> msgid "Install/Uninstall"</div><div>@@ -950,7 +951,7 @@ msgstr "白"</div><div> </div><div> #: comdlg32.rc:52</div><div> msgid "Unreadable Entry"</div><div>-msgstr ""</div>
<div>+msgstr "読み込めない入力"</div><div> </div><div> #: comdlg32.rc:54</div><div> msgid ""</div><div>@@ -1273,7 +1274,7 @@ msgstr "次回更新場所"</div><div> </div><div> #: crypt32.rc:42</div><div> msgid "Yes or No Trust"</div>
<div>-msgstr ""</div><div>+msgstr "はい または いいえ"</div><div> </div><div> #: crypt32.rc:43</div><div> msgid "Email Address"</div><div>@@ -1322,7 +1323,7 @@ msgstr "CPS"</div><div> </div>
<div> #: crypt32.rc:54 cryptdlg.rc:32</div><div> msgid "User Notice"</div><div>-msgstr ""</div><div>+msgstr "ユーザへの注意"</div><div> </div><div> #: crypt32.rc:55</div><div> msgid "On-line Certificate Status Protocol"</div>
<div>@@ -1430,23 +1431,23 @@ msgstr "シリアル番号"</div><div> </div><div> #: crypt32.rc:81</div><div> msgid "CA Version"</div><div>-msgstr ""</div><div>+msgstr "CA バージョン"</div><div> </div>
<div> #: crypt32.rc:82</div><div> msgid "Cross CA Version"</div><div>-msgstr ""</div><div>+msgstr "クロス CA バージョン"</div><div> </div><div> #: crypt32.rc:83</div><div> msgid "Serialized Signature Serial Number"</div>
<div>-msgstr ""</div><div>+msgstr "序列された署名のシリアル番号"</div><div> </div><div> #: crypt32.rc:84</div><div> msgid "Principal Name"</div><div>-msgstr ""</div><div>+msgstr "プリンシパル名"</div>
<div> </div><div> #: crypt32.rc:85</div><div> msgid "Windows Product Update"</div><div>-msgstr ""</div><div>+msgstr "Windows 製品のアップデート"</div><div> </div><div> #: crypt32.rc:86</div><div> msgid "Enrollment Name Value Pair"</div>
<div>@@ -1454,7 +1455,7 @@ msgstr ""</div><div> </div><div> #: crypt32.rc:87</div><div> msgid "OS Version"</div><div>-msgstr ""</div><div>+msgstr "OS バージョン"</div><div> </div><div> #: crypt32.rc:88</div>
<div> msgid "Enrollment CSP"</div><div>@@ -1462,7 +1463,7 @@ msgstr ""</div><div> </div><div> #: crypt32.rc:89</div><div> msgid "CRL Number"</div><div>-msgstr ""</div><div>+msgstr "CRL ナンバ"</div>
<div> </div><div> #: crypt32.rc:90</div><div> msgid "Delta CRL Indicator"</div><div>@@ -1478,7 +1479,7 @@ msgstr ""</div><div> </div><div> #: crypt32.rc:93</div><div> msgid "Name Constraints"</div>
<div>-msgstr ""</div><div>+msgstr "名前制約"</div><div> </div><div> #: crypt32.rc:94</div><div> msgid "Policy Mappings"</div><div>@@ -1494,39 +1495,39 @@ msgstr ""</div><div> </div><div>
#: crypt32.rc:97</div><div> msgid "Application Policies"</div><div>-msgstr ""</div><div>+msgstr "アプリケーションポリシー"</div><div> </div><div> #: crypt32.rc:98</div><div> msgid "Application Policy Mappings"</div>
<div>-msgstr ""</div><div>+msgstr "アプリケーション・ポリシーの表示"</div><div> </div><div> #: crypt32.rc:99</div><div> msgid "Application Policy Constraints"</div><div>-msgstr ""</div><div>+msgstr "アプリケーションポリシーの制約"</div>
<div> </div><div> #: crypt32.rc:100</div><div> msgid "CMC Data"</div><div>-msgstr ""</div><div>+msgstr "CMCデータ"</div><div> </div><div> #: crypt32.rc:101</div><div> msgid "CMC Response"</div>
<div>-msgstr ""</div><div>+msgstr "CMC レスポンス"</div><div> </div><div> #: crypt32.rc:102</div><div> msgid "Unsigned CMC Request"</div><div>-msgstr ""</div><div>+msgstr "非署名CMCリクエスト"</div>
<div> </div><div> #: crypt32.rc:103</div><div> msgid "CMC Status Info"</div><div>-msgstr ""</div><div>+msgstr "CMC 状態情報"</div><div> </div><div> #: crypt32.rc:104</div><div> msgid "CMC Extensions"</div>
<div>-msgstr ""</div><div>+msgstr "CMC 拡張機能"</div><div> </div><div> #: crypt32.rc:105</div><div> msgid "CMC Attributes"</div><div>-msgstr ""</div><div>+msgstr "CMC 属性"</div>
<div> </div><div> #: crypt32.rc:106</div><div> msgid "PKCS 7 Data"</div><div>@@ -1554,11 +1555,11 @@ msgstr ""</div><div> </div><div> #: crypt32.rc:112</div><div> msgid "Previous CA Certificate Hash"</div>
<div>-msgstr ""</div><div>+msgstr "前のCA証明書のハッシュ"</div><div> </div><div> #: crypt32.rc:113</div><div> msgid "Virtual Base CRL Number"</div><div>-msgstr ""</div><div>+msgstr "仮想ベースのCRL数"</div>
<div> </div><div> #: crypt32.rc:114</div><div> msgid "Next CRL Publish"</div><div>@@ -1566,7 +1567,7 @@ msgstr ""</div><div> </div><div> #: crypt32.rc:115</div><div> msgid "CA Encryption Certificate"</div>
<div>-msgstr ""</div><div>+msgstr "CA 暗号証明書"</div><div> </div><div> #: crypt32.rc:116 cryptui.rc:145</div><div> msgid "Key Recovery Agent"</div><div>@@ -1574,7 +1575,7 @@ msgstr "キー回復エージェント"</div>
<div> </div><div> #: crypt32.rc:117</div><div> msgid "Certificate Template Information"</div><div>-msgstr ""</div><div>+msgstr "証明書のテンプレート情報"</div><div> </div><div> #: crypt32.rc:118</div><div>
msgid "Enterprise Root OID"</div><div>@@ -1582,7 +1583,7 @@ msgstr ""</div><div> </div><div> #: crypt32.rc:119</div><div> msgid "Dummy Signer"</div><div>-msgstr ""</div><div>+msgstr "ダミー署名"</div>
<div> </div><div> #: crypt32.rc:120</div><div> msgid "Encrypted Private Key"</div><div>@@ -1847,7 +1848,7 @@ msgstr "CA"</div><div> </div><div> #: crypt32.rc:193</div><div> msgid "End Entity"</div>
<div>-msgstr ""</div><div>+msgstr "エンティティの終了"</div><div> </div><div> #: crypt32.rc:194</div><div> msgid "Path Length Constraint="</div><div>@@ -2045,7 +2046,7 @@ msgstr ""</div><div>
</div><div> #: cryptdlg.rc:33</div><div> msgid "Qualifier"</div><div>-msgstr ""</div><div>+msgstr "予選"</div><div> </div><div> #: cryptdlg.rc:34</div><div> msgid "Notice Reference"</div>
<div>@@ -2647,7 +2648,7 @@ msgstr "CMS/PKCS #7 メッセージ"</div><div> </div><div> #: cryptui.rc:94</div><div> msgid "Personal Information Exchange"</div><div>-msgstr ""</div><div>+msgstr "個人情報の変換"</div>
<div> </div><div> #: cryptui.rc:96</div><div> msgid "The import was successful."</div><div>@@ -2861,7 +2862,7 @@ msgstr "CMS/PKCS #7 メッセージ (*.p7b)"</div><div> </div><div> #: cryptui.rc:158</div><div> msgid "Personal Information Exchange (*.pfx)"</div>
<div>-msgstr ""</div><div>+msgstr "個人情報の変換 (*.pfx)"</div><div> </div><div> #: cryptui.rc:160</div><div> msgid "File Format"</div><div>@@ -7910,32 +7911,32 @@ msgstr "プログラム"</div><div>
</div><div> #: shell32.rc:201</div><div> msgid "My Documents"</div><div>-msgstr ""</div><div>+msgstr "マイドキュメント"</div><div> </div><div> #: shell32.rc:202</div><div> msgid "Favorites"</div>
<div>-msgstr ""</div><div>+msgstr "お気に入り"</div><div> </div><div> #: shell32.rc:203</div><div> msgid "StartUp"</div><div>-msgstr ""</div><div>+msgstr "スタートアップ"</div><div> </div>
<div> #: shell32.rc:204</div><div> msgid "Start Menu"</div><div>-msgstr ""</div><div>+msgstr "スタートアップ"</div><div> </div><div> #: shell32.rc:205</div><div> msgid "My Music"</div><div>
-msgstr ""</div><div>+msgstr "マイミュージック"</div><div> </div><div> #: shell32.rc:206</div><div> msgid "My Videos"</div><div>-msgstr ""</div><div>+msgstr "マイビデオ"</div><div> </div>
<div> #: shell32.rc:207</div><div> msgctxt "directory"</div><div> msgid "Desktop"</div><div>-msgstr ""</div><div>+msgstr "デスクトップ"</div><div> </div><div> #: shell32.rc:208</div><div>
msgid "NetHood"</div><div>@@ -7943,7 +7944,7 @@ msgstr ""</div><div> </div><div> #: shell32.rc:209</div><div> msgid "Templates"</div><div>-msgstr ""</div><div>+msgstr "テンプレート"</div>
<div> </div><div> #: shell32.rc:210</div><div> msgid "PrintHood"</div><div>@@ -7951,7 +7952,7 @@ msgstr ""</div><div> </div><div> #: shell32.rc:211 winhlp32.rc:45</div><div> msgid "History"</div>
<div>-msgstr ""</div><div>+msgstr "履歴"</div><div> </div><div> #: shell32.rc:212</div><div> msgid "Program Files"</div><div>@@ -7959,7 +7960,7 @@ msgstr "Program Files"</div><div> </div>
<div> #: shell32.rc:214</div><div> msgid "My Pictures"</div><div>-msgstr ""</div><div>+msgstr "マイピクチャ"</div><div> </div><div> #: shell32.rc:215</div><div> msgid "Common Files"</div>
<div>@@ -7967,23 +7968,23 @@ msgstr "Common Files"</div><div> </div><div> #: shell32.rc:216 shell32.rc:147 shell32.rc:232</div><div> msgid "Documents"</div><div>-msgstr ""</div><div>+msgstr "ドキュメント"</div>
<div> </div><div> #: shell32.rc:217</div><div> msgid "Administrative Tools"</div><div>-msgstr ""</div><div>+msgstr "管理ツール"</div><div> </div><div> #: shell32.rc:218</div><div> msgid "Music"</div>
<div>-msgstr ""</div><div>+msgstr "ミュージック"</div><div> </div><div> #: shell32.rc:219</div><div> msgid "Pictures"</div><div>-msgstr ""</div><div>+msgstr "ピクチャ"</div><div> </div>
<div> #: shell32.rc:220</div><div> msgid "Videos"</div><div>-msgstr ""</div><div>+msgstr "ビデオ"</div><div> </div><div> #: shell32.rc:213</div><div> msgid "Program Files (x86)"</div><div>
@@ -7991,19 +7992,19 @@ msgstr "Program Files (x86)"</div><div> </div><div> #: shell32.rc:221</div><div> msgid "Contacts"</div><div>-msgstr ""</div><div>+msgstr "コンタクト"</div><div> </div>
<div> #: shell32.rc:222 winefile.rc:110</div><div> msgid "Links"</div><div>-msgstr ""</div><div>+msgstr "リンク"</div><div> </div><div> #: shell32.rc:223</div><div> msgid "Slide Shows"</div>
<div>-msgstr ""</div><div>+msgstr "スライドショー"</div><div> </div><div> #: shell32.rc:224</div><div> msgid "Playlists"</div><div>-msgstr ""</div><div>+msgstr "プレイリスト"</div><div>
</div><div> #: shell32.rc:148 taskmgr.rc:326</div><div> msgid "Status"</div><div>@@ -8019,35 +8020,35 @@ msgstr "機種名"</div><div> </div><div> #: shell32.rc:225</div><div> msgid "Sample Music"</div>
<div>-msgstr ""</div><div>+msgstr "サンプルミュージック"</div><div> </div><div> #: shell32.rc:226</div><div> msgid "Sample Pictures"</div><div>-msgstr ""</div><div>+msgstr "サンプルピクチャ"</div>
<div> </div><div> #: shell32.rc:227</div><div> msgid "Sample Playlists"</div><div>-msgstr ""</div><div>+msgstr "サンプルプレイリスト"</div><div> </div><div> #: shell32.rc:228</div><div> msgid "Sample Videos"</div>
<div>-msgstr ""</div><div>+msgstr "サンプルビデオ"</div><div> </div><div> #: shell32.rc:229</div><div> msgid "Saved Games"</div><div>-msgstr ""</div><div>+msgstr "保存済みのゲーム"</div>
<div> </div><div> #: shell32.rc:230</div><div> msgid "Searches"</div><div>-msgstr ""</div><div>+msgstr "検索"</div><div> </div><div> #: shell32.rc:231</div><div> msgid "Users"</div><div>
-msgstr ""</div><div>+msgstr "ユーザー"</div><div> </div><div> #: shell32.rc:233</div><div> msgid "Downloads"</div><div>-msgstr ""</div><div>+msgstr "ダウンロード"</div><div> </div>
<div> #: shell32.rc:166</div><div> msgid "Unable to create new Folder: Permission denied."</div><div>@@ -9977,7 +9978,7 @@ msgstr "ファイル タイプ '%1' に関連付けられた開くコマンド</div><div> </div><div> #: cmd.rc:322</div>
<div> msgid "Overwrite %1?"</div><div>-msgstr "上書き %1?"</div><div>+msgstr "%1を上書きしますか?"</div><div> </div><div> #: cmd.rc:323</div><div> msgid "More..."</div><div>@@ -10082,7 +10083,7 @@ msgstr "Wine コマンド プロンプト"</div>
<div> </div><div> #: cmd.rc:349</div><div> msgid "Wine CMD Version %1!S!\n"</div><div>-msgstr ""</div><div>+msgstr "Wine CMD バージョン %1!S!\n"</div><div> </div><div> #: cmd.rc:350</div><div> msgid "More? "</div>
<div>@@ -10368,7 +10369,7 @@ msgstr "アクティブな接続"</div><div> </div><div> #: netstat.rc:28</div><div> msgid "Proto"</div><div>-msgstr ""</div><div>+msgstr "プロト"</div><div> </div><div> #: netstat.rc:29</div>
<div> msgid "Local Address"</div><div>@@ -10420,47 +10421,41 @@ msgstr "不明なプロトコル"</div><div> </div><div> #: netstat.rc:41</div><div> msgid "TCP Statistics for IPv4"</div><div>-msgstr ""</div>
<div>+msgstr "IPv4 用TCP の統計"</div><div> </div><div> #: netstat.rc:42</div><div>-#, fuzzy</div><div> #| msgid "Active Connections"</div><div> msgid "Active Opens"</div><div> msgstr "アクティブな接続"</div>
<div> </div><div> #: netstat.rc:43</div><div> msgid "Passive Opens"</div><div>-msgstr ""</div><div>+msgstr "アクティブでないオープン"</div><div> </div><div> #: netstat.rc:44</div><div>-#, fuzzy</div><div>
#| msgid "Active Connections"</div><div> msgid "Failed Connection Attempts"</div><div>-msgstr "アクティブな接続"</div><div>+msgstr "接続の試行に失敗しました"</div><div> </div><div> #: netstat.rc:45</div>
<div>-#, fuzzy</div><div> #| msgid "Active Connections"</div><div> msgid "Reset Connections"</div><div>-msgstr "アクティブな接続"</div><div>+msgstr "接続をリセット"</div><div> </div><div> #: netstat.rc:46</div>
<div>-#, fuzzy</div><div> #| msgid "Active Connections"</div><div> msgid "Current Connections"</div><div>-msgstr "アクティブな接続"</div><div>+msgstr "現在の接続"</div><div> </div><div> #: netstat.rc:47</div>
<div>-#, fuzzy</div><div> #| msgid "Segment locked.\n"</div><div> msgid "Segments Received"</div><div>-msgstr "セグメントはロックされています。\n"</div><div>+msgstr "セグメントを受信しました"</div><div> </div>
<div> #: netstat.rc:48</div><div>-#, fuzzy</div><div> #| msgid "Segment locked.\n"</div><div> msgid "Segments Sent"</div><div>-msgstr "セグメントはロックされています。\n"</div><div>+msgstr "セグメント送信"</div>
<div> </div><div> #: netstat.rc:49</div><div> msgid "Segments Retransmitted"</div><div>@@ -10468,29 +10463,26 @@ msgstr ""</div><div> </div><div> #: netstat.rc:50</div><div> msgid "UDP Statistics for IPv4"</div>
<div>-msgstr ""</div><div>+msgstr "IPv4 用UDP の統計"</div><div> </div><div> #: netstat.rc:51</div><div>-#, fuzzy</div><div> #| msgid "Segment locked.\n"</div><div> msgid "Datagrams Received"</div>
<div>-msgstr "セグメントはロックされています。\n"</div><div>+msgstr "データグラムを受け取りました"</div><div> </div><div> #: netstat.rc:52</div><div>-#, fuzzy</div><div> #| msgid "Local Port"</div><div> msgid "No Ports"</div>
<div>-msgstr "ローカル ポート"</div><div>+msgstr "ポート無し"</div><div> </div><div> #: netstat.rc:53</div><div>-#, fuzzy</div><div> #| msgid "Decoding Error"</div><div> msgid "Receive Errors"</div>
<div>-msgstr "デコード エラー"</div><div>+msgstr "受信 エラー"</div><div> </div><div> #: netstat.rc:54</div><div> msgid "Datagrams Sent"</div><div>-msgstr ""</div><div>+msgstr "データグラムの送信"</div>
<div> </div><div> #: notepad.rc:27</div><div> msgid "&New\tCtrl+N"</div><div>@@ -11028,7 +11020,7 @@ msgstr "インターフェイス"</div><div> </div><div> #: oleview.rc:138</div><div> msgid "Registry"</div>
<div>-msgstr ""</div><div>+msgstr "レジストリ"</div><div> </div><div> #: oleview.rc:139</div><div> msgid "Implementation"</div><div>@@ -11036,7 +11028,7 @@ msgstr ""</div><div> </div><div>
#: oleview.rc:140</div><div> msgid "Activation"</div><div>-msgstr ""</div><div>+msgstr "有効化"</div><div> </div><div> #: oleview.rc:142</div><div> msgid "CoGetClassObject failed."</div>
<div>@@ -12560,7 +12552,7 @@ msgstr ""</div><div> </div><div> #: view.rc:33</div><div> msgid "&Pan"</div><div>-msgstr "パン(&P)"</div><div>+msgstr "回す(&P)"</div><div> </div>
<div> #: view.rc:35</div><div> msgid "&Scale to Window"</div><div>diff --git a/tools/wine.desktop b/tools/wine.desktop</div><div>index c90753f..234e7e2 100644</div><div>--- a/tools/wine.desktop</div><div>+++ b/tools/wine.desktop</div>
<div>@@ -22,6 +22,7 @@ Name[sr]=Wine - дизач Windows програма</div><div> Name[sr@latin]=Wine - dizač Windows programa</div><div> Name[hr]=Wine - dizač Windows programa</div><div> Name[he]=Wine — מריץ תכניות Windows</div><div>
+Name[ja]=Wine Windowsプログラムローダー</div><div> Exec=wine start /unix %f</div><div> MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;</div><div> Icon=wine</div><div>-- </div><div>1.8.1.2</div>
<div><br></div>