-
Notifications
You must be signed in to change notification settings - Fork 810
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
54 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ msgid "" | |
| msgstr "" | ||
| "Project-Id-Version: WinMerge 2.16\n" | ||
| "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" | ||
| "POT-Creation-Date: 2024-07-26 21:43+0900\n" | ||
| "POT-Creation-Date: 2024-07-27 11:21+0900\n" | ||
| "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
| "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| "Language-Team: LANGUAGE <[email protected]>\n" | ||
|
|
@@ -6445,7 +6445,7 @@ msgstr "" | |
|
|
||
| #. type: Content of: <article><section><section><itemizedlist><listitem><para> | ||
| #: ./English/Configuration.xml:1876 | ||
| msgid "<option>DirectWrite Modes</option>: Renders text using various DirectWrite rendering modes, including support for colored emojis on Windows 8.1 and later. See <ulink url=\"https://learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-dwrite_rendering_mode#constants\">DirectWrite Rendering Modes</ulink> for details." | ||
| msgid "<option>DirectWrite Modes</option>: Renders text using various DirectWrite rendering modes, including support for colored emojis on Windows 8.1 and later. Available only in the 64-bit version of WinMerge. See <ulink url=\"https://learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-dwrite_rendering_mode#constants\">DirectWrite Rendering Modes</ulink> for details." | ||
| msgstr "" | ||
|
|
||
| #. type: Content of: <article><section><title> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ msgid "" | |
| msgstr "" | ||
| "Project-Id-Version: WinMerge\n" | ||
| "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" | ||
| "POT-Creation-Date: 2024-07-26 21:43+0900\n" | ||
| "POT-Creation-Date: 2024-07-27 11:21+0900\n" | ||
| "PO-Revision-Date: 2024-03-02 19:07+0900\n" | ||
| "Last-Translator: Takashi Sawanaka <[email protected]>\n" | ||
| "Language-Team: Japanese <[email protected]>\n" | ||
|
|
@@ -7356,14 +7356,16 @@ msgstr "ファイル比較では、ファイル中の最初の差異ブロック | |
| #. type: Content of: <article><section><section><title><indexterm><primary> | ||
| #: English/Configuration.xml:181 | ||
| msgid "autoscrolling to first inline difference" | ||
| msgstr "" | ||
| msgstr "最初の行内差異まで自動スクロール" | ||
|
|
||
| #. type: Content of: <article><section><section><title> | ||
| #: English/Configuration.xml:180 | ||
| msgid "" | ||
| "Automatically scroll to first inline difference<placeholder " | ||
| "type=\"indexterm\" id=\"0\"/>" | ||
| msgstr "" | ||
| "自動的に最初の行内差異にスクロールする<placeholder type=\"indexterm\" " | ||
| "id=\"0\"/>" | ||
|
|
||
| #. type: Content of: <article><section><section><itemizedlist><listitem><para> | ||
| #: English/Configuration.xml:188 | ||
|
|
@@ -7372,13 +7374,17 @@ msgid "" | |
| "not automatically scroll to the first inline difference within the lines of " | ||
| "text." | ||
| msgstr "" | ||
| "<option>無効</option>（デフォルト）：差異ブロックに移動する際、テキストの行の" | ||
| "最初のインライン差異まで自動スクロールしません。" | ||
|
|
||
| #. type: Content of: <article><section><section><itemizedlist><listitem><para> | ||
| #: English/Configuration.xml:194 | ||
| msgid "" | ||
| "<option>Enabled</option>: When moving to a difference block, automatically " | ||
| "scrolls to the first inline difference within the lines of text." | ||
| msgstr "" | ||
| "<option>有効</option>：差異ブロックに移動すると、テキストの行の最初の行内差異" | ||
| "まで自動的にスクロールします。" | ||
|
|
||
| #. type: Content of: <article><section><section><title><indexterm><primary> | ||
| #: English/Configuration.xml:203 | ||
|
|
@@ -7524,6 +7530,12 @@ msgid "" | |
| "external applications, like SourceTree, need to wait for WinMerge to finish " | ||
| "before they can safely delete temporary files." | ||
| msgstr "" | ||
| "<option>1つのみインスタンスを起動し、既起動インスタンスの終了を待つ</" | ||
| "option>：「1つのみインスタンスを起動する」オプションと同様に、この設定は" | ||
| "WinMergeを単一のアプリケーションウィンドウに制限します。 ただし、アプリケー" | ||
| "ションウィンドウが閉じられるまで、後に起動したWinMergeのプロセスは終了しませ" | ||
| "ん。これは、SourceTreeなどの外部Diffツールのプロセス終了後に一時ファイルを削" | ||
| "除してしまうアプリケーションとの連携に便利です。" | ||
|
|
||
| #. type: Content of: <article><section><section><title> | ||
| #: English/Configuration.xml:320 | ||
|
|
@@ -8640,27 +8652,35 @@ msgid "" | |
| "<option>Do not expand</option> (default): Subfolders remain collapsed after " | ||
| "comparison." | ||
| msgstr "" | ||
| "<option>展開しない</option> (default): 比較後、サブフォルダーは折りたたまれた" | ||
| "ままになります。" | ||
|
|
||
| #. type: Content of: <article><section><section><itemizedlist><listitem><para> | ||
| #: English/Configuration.xml:1230 | ||
| msgid "" | ||
| "<option>Expand all subfolders</option>: All subfolders are expanded after " | ||
| "comparison." | ||
| msgstr "" | ||
| "<option>すべてのサブフォルダーを展開</option>: 比較後、すべてのサブフォルダー" | ||
| "が展開されます。" | ||
|
|
||
| #. type: Content of: <article><section><section><itemizedlist><listitem><para> | ||
| #: English/Configuration.xml:1236 | ||
| msgid "" | ||
| "<option>Expand different subfolders</option>: Only subfolders with " | ||
| "differences are expanded after comparison." | ||
| msgstr "" | ||
| "<option>差異のあるサブフォルダーを展開</option>: 比較後、差異のあるサブフォル" | ||
| "ダーのみが展開されます。" | ||
|
|
||
| #. type: Content of: <article><section><section><itemizedlist><listitem><para> | ||
| #: English/Configuration.xml:1242 | ||
| msgid "" | ||
| "<option>Expand identical subfolders</option>: Only subfolders without " | ||
| "differences are expanded after comparison." | ||
| msgstr "" | ||
| "<option>同一のサブフォルダーを展開</option>: 比較後、相違点のないサブフォル" | ||
| "ダーのみが展開されます。" | ||
|
|
||
| #. type: Content of: <article><section><section><title><indexterm><primary> | ||
| #: English/Configuration.xml:1251 | ||
|
|
@@ -8681,13 +8701,17 @@ msgid "" | |
| "<option>Disabled</option> (default): WinMerge ignore unique subfolders when " | ||
| "comparing folders." | ||
| msgstr "" | ||
| "<option>無効</option>(デフォルト): WinMerge は、比較時片方しか存在しないサブ" | ||
| "フォルダーを無視します。" | ||
|
|
||
| #. type: Content of: <article><section><section><itemizedlist><listitem><para> | ||
| #: English/Configuration.xml:1266 | ||
| msgid "" | ||
| "<option>Enabled</option>: WinMerge also shows the content from unique " | ||
| "subfolders." | ||
| msgstr "" | ||
| "<option>有効</option>: WinMerge は、片方しか存在しないサブフォルダー内の内容" | ||
| "も表示します。" | ||
|
|
||
| #. type: Content of: <article><section><section><title><indexterm><primary> | ||
| #: English/Configuration.xml:1275 | ||
|
|
@@ -9445,9 +9469,10 @@ msgstr "" | |
| msgid "" | ||
| "<option>DirectWrite Modes</option>: Renders text using various DirectWrite " | ||
| "rendering modes, including support for colored emojis on Windows 8.1 and " | ||
| "later. See <ulink url=\"https://learn.microsoft.com/en-us/windows/win32/api/" | ||
| "dwrite/ne-dwrite-dwrite_rendering_mode#constants\">DirectWrite Rendering " | ||
| "Modes</ulink> for details." | ||
| "later. Available only in the 64-bit version of WinMerge. See <ulink " | ||
| "url=\"https://learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-" | ||
| "dwrite_rendering_mode#constants\">DirectWrite Rendering Modes</ulink> for " | ||
| "details." | ||
| msgstr "" | ||
|
|
||
| #. type: Content of: <article><section><title> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ msgstr "" | |
| "Project-Id-Version: WinMerge\n" | ||
| "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" | ||
| "POT-Creation-Date: 2020-12-05 22:07+0000\n" | ||
| "PO-Revision-Date: 2024-06-22 09:45+0900\n" | ||
| "PO-Revision-Date: 2024-07-27 14:31+0900\n" | ||
| "Last-Translator: Takashi Sawanaka <[email protected]>\n" | ||
| "Language-Team: Japanese <[email protected]>\n" | ||
| "Language: ja\n" | ||
|
|
@@ -1137,7 +1137,7 @@ msgid "${SRC_FILE} - Source file" | |
| msgstr "${SRC_FILE} - ソースファイル" | ||
|
|
||
| msgid "${SRC_FOLDER} - Source folder" | ||
| msgstr "${SRC_FOLDER} - ソースフォルダ" | ||
| msgstr "${SRC_FOLDER} - ソースフォルダー" | ||
|
|
||
| msgid "${SRC_URL} - Source URL" | ||
| msgstr "${SRC_URL} - ソースURL" | ||
|
|
@@ -1152,7 +1152,7 @@ msgid "${DST_FILE} - Destination file" | |
| msgstr "${DST_FILE} - 宛先ファイル" | ||
|
|
||
| msgid "${DST_FOLDER} - Destination folder" | ||
| msgstr "${DST_FOLDER} - 宛先フォルダ" | ||
| msgstr "${DST_FOLDER} - 宛先フォルダー" | ||
|
|
||
| msgid "${DST_URL} - Destination URL" | ||
| msgstr "${DST_URL} - 宛先URL" | ||
|
|
@@ -2432,13 +2432,13 @@ msgid "Do not expand" | |
| msgstr "展開しない" | ||
|
|
||
| msgid "Expand all subfolders" | ||
| msgstr "すべてのサブフォルダを展開" | ||
| msgstr "すべてのサブフォルダーを展開" | ||
|
|
||
| msgid "Expand different subfolders" | ||
| msgstr "差異のあるサブフォルダを展開" | ||
| msgstr "差異のあるサブフォルダーを展開" | ||
|
|
||
| msgid "Expand identical subfolders" | ||
| msgstr "同一のサブフォルダを展開" | ||
| msgstr "同一のサブフォルダーを展開" | ||
|
|
||
| msgid "File Type" | ||
| msgstr "ファイル タイプ" | ||
|
|
@@ -4843,12 +4843,12 @@ msgstr "patch コマンドへ渡す引数を指定してください" | |
| #, c-format | ||
| msgid "Enter the name of the folder to which the patch '%1' will be applied" | ||
| msgstr "" | ||
| "パッチ '%1' を適用するフォルダを指定してください\r\n" | ||
| "パッチ '%1' を適用するフォルダーを指定してください\r\n" | ||
| "(※ 指定したフォルダ内のファイルを一時フォルダにコピーし、一時フォルダ側のファイルにパッチを適用します)" | ||
|
|
||
| #, c-format | ||
| msgid "Folder '%1' does not exist" | ||
| msgstr "フォルダ'%1' は存在しません" | ||
| msgstr "フォルダー'%1' は存在しません" | ||
|
|
||
| msgid "Do not specify the '-p0' command line option for the patch file which includes absolute paths" | ||
| msgstr "絶対パスが含まれているパッチファイルに '-p0' オプションが指定されました。このまま実行するとパッチが一時ファイルではなく、元ファイルに適用されてしまう可能性があるため、中止します。" | ||
|
|
||