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