-
Notifications
You must be signed in to change notification settings - Fork 815
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issue #2597: Typos and minor errors in WinMerge manual
- Loading branch information
Showing
4 changed files
with
20 additions
and
20 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-12-27 08:45+0900\n" | ||
"POT-Creation-Date: 2025-01-01 21:52+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" | ||
|
@@ -3954,12 +3954,12 @@ msgstr "" | |
|
||
#. type: Content of: <article><section><title><indexterm><primary> | ||
#: ./English/Compare_files.xml:1474 | ||
msgid "syncronization points" | ||
msgid "synchronization points" | ||
msgstr "" | ||
|
||
#. type: Content of: <article><section><title> | ||
#: ./English/Compare_files.xml:1473 | ||
msgid "Syncronization points<placeholder type=\"indexterm\" id=\"0\"/>" | ||
msgid "Synchronization points<placeholder type=\"indexterm\" id=\"0\"/>" | ||
msgstr "" | ||
|
||
#. type: Content of: <article><section><title> | ||
|
@@ -3985,7 +3985,7 @@ msgstr "" | |
|
||
#. type: Content of: <article><section><section><para> | ||
#: ./English/Compare_files.xml:1494 | ||
msgid "By default, the <guilabel>Automatic rescan</guilabel> option is enabled in the Editor page of WinMerge options. Rescanning keeps your your compare and merge operations up to date. Without rescanning, WinMerge differences does not detect changes that might occur to files while you are comparing them, for example in an external editor." | ||
msgid "By default, the <guilabel>Automatic rescan</guilabel> option is enabled in the Editor page of WinMerge options. Rescanning keeps your compare and merge operations up to date. Without rescanning, WinMerge differences does not detect changes that might occur to files while you are comparing them, for example in an external editor." | ||
msgstr "" | ||
|
||
#. type: Content of: <article><section><section><para> | ||
|
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-12-27 08:45+0900\n" | ||
"POT-Creation-Date: 2025-01-01 21:52+0900\n" | ||
"PO-Revision-Date: 2024-10-06 20:19+0900\n" | ||
"Last-Translator: Takashi Sawanaka <[email protected]>\n" | ||
"Language-Team: Japanese <[email protected]>\n" | ||
|
@@ -5844,12 +5844,12 @@ msgstr "" | |
|
||
#. type: Content of: <article><section><title><indexterm><primary> | ||
#: English/Compare_files.xml:1474 | ||
msgid "syncronization points" | ||
msgid "synchronization points" | ||
msgstr "" | ||
|
||
#. type: Content of: <article><section><title> | ||
#: English/Compare_files.xml:1473 | ||
msgid "Syncronization points<placeholder type=\"indexterm\" id=\"0\"/>" | ||
msgid "Synchronization points<placeholder type=\"indexterm\" id=\"0\"/>" | ||
msgstr "同期ポイント<placeholder type=\"indexterm\" id=\"0\"/>" | ||
|
||
#. type: Content of: <article><section><title> | ||
|
@@ -5880,10 +5880,10 @@ msgstr "ファイルの再スキャン<placeholder type=\"indexterm\" id=\"0\"/> | |
#: English/Compare_files.xml:1494 | ||
msgid "" | ||
"By default, the <guilabel>Automatic rescan</guilabel> option is enabled in " | ||
"the Editor page of WinMerge options. Rescanning keeps your your compare and " | ||
"merge operations up to date. Without rescanning, WinMerge differences does " | ||
"not detect changes that might occur to files while you are comparing them, " | ||
"for example in an external editor." | ||
"the Editor page of WinMerge options. Rescanning keeps your compare and merge " | ||
"operations up to date. Without rescanning, WinMerge differences does not " | ||
"detect changes that might occur to files while you are comparing them, for " | ||
"example in an external editor." | ||
msgstr "" | ||
|
||
#. type: Content of: <article><section><section><para> | ||
|