Skip to content

Commit

Permalink
Fix issue #2597: Typos and minor errors in WinMerge manual
Browse files Browse the repository at this point in the history
  • Loading branch information
sdottaka committed Jan 1, 2025
1 parent b9df86d commit 576e3fe
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions Docs/Manual/English/Compare_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1470,8 +1470,8 @@
</section>

<section id="Compare_files_syncpoints">
<title>Syncronization points<indexterm>
<primary>syncronization points</primary>
<title>Synchronization points<indexterm>
<primary>synchronization points</primary>
</indexterm></title>
<para>TBD</para>
</section>
Expand All @@ -1492,7 +1492,7 @@
</indexterm></title>

<para>By default, the <guilabel>Automatic rescan</guilabel> option is
enabled in the Editor page of WinMerge options. Rescanning keeps your your
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.</para>
Expand Down
12 changes: 6 additions & 6 deletions Docs/Manual/Japanese/Compare_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1232,8 +1232,8 @@ panes).</para>
</section>

<section id="Compare_files_syncpoints">
<title>同期ポイント<indexterm>
<primary>syncronization points</primary>
<title>Synchronization points<indexterm>
<primary>synchronization points</primary>
</indexterm></title>
<para>TBD</para>
</section>
Expand All @@ -1253,10 +1253,10 @@ WinMerge's editing functions (described earlier in this topic).</para>
</indexterm></title>

<para>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.</para>
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.</para>

<para>Rescanning occurs when you perform certain actions (like merging a
difference or editing a file) during a file compare. If a file has changed,
Expand Down
8 changes: 4 additions & 4 deletions Translations/Docs/Manual/English.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
14 changes: 7 additions & 7 deletions Translations/Docs/Manual/Japanese.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 576e3fe

Please sign in to comment.