Skip to content

Commit 01df553

Browse files
sdottakasdottaka
committed
Rewrite English.pot, add JXL image extension (#2682) (2)
1 parent a1dfc84 commit 01df553

File tree

170 files changed

+13911
-14535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+13911
-14535
lines changed

‎Docs/Manual/English/Compare_dirs.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ added/deleted/copied. User can create a new archive file using above menuitems i
12631263
</listitem>
12641264

12651265
<listitem>
1266-
<para><guilabel>Comparison result</guilabel>: Verbose comparison
1266+
<para><guilabel>Comparison Result</guilabel>: Verbose comparison
12671267
result (see also <guilabel>Short Result</guilabel>).</para>
12681268
</listitem>
12691269

@@ -1286,7 +1286,7 @@ added/deleted/copied. User can create a new archive file using above menuitems i
12861286
<itemizedlist>
12871287
<listitem>
12881288
<para><guilabel>Short Result</guilabel>: Displays the
1289-
<guilabel>Comparison result</guilabel> column in a brief (Right only)
1289+
<guilabel>Comparison Result</guilabel> column in a brief (Right only)
12901290
form.</para>
12911291
</listitem>
12921292

@@ -1388,10 +1388,10 @@ added/deleted/copied. User can create a new archive file using above menuitems i
13881388
context menu.</para>
13891389

13901390
<para>If the selection occurs on both sides, you can choose either the
1391-
<guimenu>Left shell menu</guimenu> or <guimenu>Right shell menu</guimenu>.
1391+
<guimenu>Left Shell Menu</guimenu> or <guimenu>Right Shell Menu</guimenu>.
13921392
If the selection occurs on all sides, you can choose the
1393-
<guimenu>Left shell menu</guimenu>, <guimenu>Middle shell menu</guimenu> or
1394-
<guimenu>Right shell menu</guimenu>. If the item occurs only on one side,
1393+
<guimenu>Left Shell Menu</guimenu>, <guimenu>Middle Shell Menu</guimenu> or
1394+
<guimenu>Right Shell Menu</guimenu>. If the item occurs only on one side,
13951395
only that side's shell menu is available.</para>
13961396

13971397
<caution>

‎Docs/Manual/English/Configuration.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
</section>
247247

248248
<section>
249-
<title>Automatically verify paths in Open-dialog</title>
249+
<title>Automatically verify paths in Open dialog</title>
250250

251251
<itemizedlist>
252252
<listitem>
@@ -317,7 +317,7 @@
317317

318318
<listitem>
319319
<para>
320-
<option>Allow only one instance to run and wait for the instance to terminate</option>: Similar to the "Allow only one instance to run" option, this setting restricts WinMerge to a single application window. However, it also ensures that the WinMerge process does not terminate until the application window is closed. This is useful for situations where external applications, like SourceTree, need to wait for WinMerge to finish before they can safely delete temporary files.
320+
<option>Allow only one instance; wait for termination</option>: Similar to the "Allow only one instance to run" option, this setting restricts WinMerge to a single application window. However, it also ensures that the WinMerge process does not terminate until the application window is closed. This is useful for situations where external applications, like SourceTree, need to wait for WinMerge to finish before they can safely delete temporary files.
321321
</para>
322322
</listitem>
323323
</itemizedlist>
@@ -426,7 +426,7 @@
426426

427427
<section>
428428
<title>
429-
Open-dialog Auto-Completion<indexterm>
429+
Open dialog Auto completion<indexterm>
430430
<primary>MRU list</primary>
431431
</indexterm>
432432
</title>
@@ -1265,7 +1265,7 @@
12651265

12661266
<section>
12671267
<title>
1268-
Automatically expand subfolders after comparison<indexterm>
1268+
Expand subfolders after comparison<indexterm>
12691269
<primary>expand subfolders</primary>
12701270

12711271
<secondary>detecting and ignoring differences</secondary>
@@ -1349,7 +1349,7 @@
13491349

13501350
<section>
13511351
<title>
1352-
Threshold for switching to quick compare (MB)<indexterm>
1352+
Switch to quick compare when size exceeds (MB)<indexterm>
13531353
<primary>Quick compare</primary>
13541354

13551355
<secondary>limit</secondary>
@@ -1381,7 +1381,7 @@
13811381

13821382
<section>
13831383
<title>
1384-
Threshold for switching to binary compare (MB)<indexterm>
1384+
Switch to binary compare when size exceeds (MB)<indexterm>
13851385
<primary>Binary compare</primary>
13861386

13871387
<secondary>limit</secondary>
@@ -1413,7 +1413,7 @@
14131413

14141414
<section>
14151415
<title>
1416-
Number of CPU cores to use<indexterm>
1416+
CPU cores to use<indexterm>
14171417
<primary>compare threads</primary>
14181418
</indexterm>
14191419
</title>
@@ -1786,7 +1786,7 @@
17861786

17871787
<section>
17881788
<title>
1789-
Preserve original EOL chars<indexterm>
1789+
Preserve original EOL<indexterm>
17901790
<primary>EOL</primary>
17911791

17921792
<secondary>preserving</secondary>

‎Docs/Manual/English/Filters.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -970,13 +970,13 @@ Pekka Himanen</screen></para>
970970
Filter</guilabel> (see <xref linkend="Filters_FileFilterLoc" /> for
971971
their uses) and click <keycap>OK</keycap>.</para>
972972

973-
<para>The Select filename for new filter dialog opens in the shared
973+
<para>The Select Filename for New Filter dialog opens in the shared
974974
or private files folder on your system (if the private folder does
975975
not exist, WinMerge creates it).</para>
976976
</listitem>
977977

978978
<listitem>
979-
<para>In the Select filename for new filter dialog, enter a new file
979+
<para>In the Select Filename for New Filter dialog, enter a new file
980980
name and click <guibutton>Save</guibutton>.</para>
981981

982982
<note>
@@ -1027,7 +1027,7 @@ Pekka Himanen</screen></para>
10271027
</listitem>
10281028

10291029
<listitem>
1030-
<para>In the Locate filter file to install dialog, navigate to
1030+
<para>In the Locate Filter File to Install dialog, navigate to
10311031
the <filename>flt</filename> file on your system, and click
10321032
<guibutton>Open</guibutton>. The File Filters list should now
10331033
include the installed file filter.</para>

‎Docs/Manual/English/Quick_start.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
and <wordasword>changed</wordasword> sides. Instead, it simply shows what is
267267
different between two selected folders. A file or folder that is found only
268268
on one side is simply shown as a unique item on that side, not as added or
269-
removed. For example, in the <guilabel>Comparison result </guilabel>column
269+
removed. For example, in the <guilabel>Comparison Result </guilabel>column
270270
of the preceding figure, <filename>Merge.aps</filename> and
271271
<filename>Merge.rc.bak</filename> are each found in only one of the compared
272272
folders.</para>
@@ -275,7 +275,7 @@
275275
<guimenu>Merge</guimenu> menu, toolbar buttons, or context (right-click)
276276
menu. The most important action is making files or folders identical in both
277277
sides by selecting one of several Copy items. When you copy a file or folder
278-
to other side, the Comparison result value changes to
278+
to other side, the Comparison Result value changes to
279279
<literal>Identical</literal>.</para>
280280

281281
<para>If a file or folder exists in both sides (and it is not a binary file)

‎Docs/Manual/Hebrew/Configuration.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ button<indexterm>
362362

363363
<section>
364364
<title>
365-
Open-dialog Auto-Completion<indexterm>
365+
Open dialog Auto completion<indexterm>
366366
<primary>רשימת MRU</primary>
367367
</indexterm></title>
368368

‎Docs/Manual/Japanese/Compare_files.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ of chars in the line.</para>
892892

893893
<listitem>
894894
<para><guilabel>EOL</guilabel>: Linefeed style of the current line (shown only
895-
when the <guilabel>Preserve original EOL chars</guilabel> option is enabled
895+
when the <guilabel>Preserve original EOL</guilabel> option is enabled
896896
in the Editor page of WinMerge options).</para>
897897
</listitem>
898898
</itemizedlist>

‎Docs/Manual/Japanese/Configuration.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ files bigger (in mega bytes) than this value are compared using
10951095

10961096
<section>
10971097
<title>
1098-
Threshold for switching to binary compare (MB)<indexterm>
1098+
Switch to binary compare when size exceeds (MB)<indexterm>
10991099
<primary>Binary compare</primary>
11001100

11011101
<secondary>limit</secondary>

‎Docs/Manual/update_translations.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if "%MSYS_HOME%" == "" (
99
(
1010
echo #!/bin/bash
1111
echo cd $^(cygpath '%CD%'^)
12-
echo po4a --verbose --wrap-po newlines --package-name WinMerge --package-version 2.16 --copyright-holder 'Thingamahoochie Software' --msgid-bugs-address https://bugs.winmerge.org/ ./Manual.cfg
12+
echo po4a --verbose --wrap-po newlines --package-name WinMerge --package-version 2.16 --copyright-holder 'Thingamahoochie Software' --msgid-bugs-address https://github.com/WinMerge/winmerge/issues ./Manual.cfg
1313
) > %MSYS_HOME%\tmp\__update_translations__.sh
1414
%MSYS_HOME%\usr\bin\bash.exe -lc /tmp/__update_translations__.sh
1515
del %MSYS_HOME%\tmp\__update_translations__.sh

‎Externals/crystaledit/Sample/Sample.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ BEGIN
280280
CONTROL "Match &case",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
281281
CONTROL "Regular &expression",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
282282
CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10
283-
CONTROL "&Don't close this dialog box",IDC_FINDDLG_DONTCLOSE,
283+
CONTROL "&Don't close this dialog",IDC_FINDDLG_DONTCLOSE,
284284
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,7,67,135,10
285285
DEFPUSHBUTTON "Find &Prev",IDC_EDIT_FINDPREV,226,7,50,14,WS_GROUP
286286
DEFPUSHBUTTON "&Find Next",IDOK,226,24,50,14,WS_GROUP
@@ -299,7 +299,7 @@ BEGIN
299299
CONTROL "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,44,135,10
300300
CONTROL "Match &case",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
301301
CONTROL "Regular &expression",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10
302-
CONTROL "&Don't wrap end of file",IDC_EDIT_SCOPE_DONT_WRAP,
302+
CONTROL "&Don't wrap at end of file",IDC_EDIT_SCOPE_DONT_WRAP,
303303
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,135,10
304304
GROUPBOX "Replace in",IDC_STATIC,149,40,90,36,WS_GROUP
305305
CONTROL "&Selection",IDC_EDIT_SCOPE_SELECTION,"Button",BS_AUTORADIOBUTTON | WS_GROUP,154,51,80,10
@@ -316,7 +316,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
316316
CAPTION "Markers"
317317
FONT 8, "MS Shell Dlg", 0, 0, 0x1
318318
BEGIN
319-
CONTROL "Enable &Markers",IDC_EDIT_MARKERS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,6,4,135,10
319+
CONTROL "Enable &markers",IDC_EDIT_MARKERS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,6,4,135,10
320320
CONTROL "",IDC_EDIT_MARKER_LIST,"SysListView32",LVS_LIST | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,6,15,231,66
321321
PUSHBUTTON "New",IDC_EDIT_MARKER_NEW,240,15,50,14,WS_GROUP
322322
PUSHBUTTON "&Delete",IDC_EDIT_MARKER_DELETE,240,30,50,14,WS_GROUP

‎Plugins/Plugins.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<plugins>
33
<plugin name="HandleSchemeHTTP">
44
<event value="URL_PACK_UNPACK" />
5-
<description value="HTTP URL Scheme Handler with curl. &#xD;&#xA;Arguments: Command line options passed to the curl command." />
5+
<description value="HTTP URL Scheme Handler (curl).&#xD;&#xA;Arguments: curl command line options." />
66
<file-filters value="^http://.*$;^https://.*$" />
77
<extended-properties value="ProcessType=URL Handling" />
88
<is-automatic value="true" />
@@ -13,7 +13,7 @@
1313
</plugin>
1414
<plugin name="HandleSchemeReg">
1515
<event value="URL_PACK_UNPACK" />
16-
<description value="Windows Registry URL Scheme Handler. &#xD;&#xA;Arguments: Command line options passed to the reg.exe command." />
16+
<description value="Windows Registry URL Scheme Handler.&#xD;&#xA;Arguments: reg.exe command line options." />
1717
<file-filters value="^reg:.*$" />
1818
<extended-properties value="ProcessType=URL Handling" />
1919
<is-automatic value="true" />
@@ -25,7 +25,7 @@
2525
</plugin>
2626
<plugin name="PrettifyHTML">
2727
<event value="FILE_PACK_UNPACK" />
28-
<description value="HTML Prettier with tidy-html5. &#xD;&#xA;Arguments: Command line options passed to the tidy command." />
28+
<description value="HTML Prettier (tidy-html5).&#xD;&#xA;Arguments: tidy command line options." />
2929
<file-filters value="\.html$;\.htm$" />
3030
<is-automatic value="false" />
3131
<unpacked-file-extension value=".html" />
@@ -37,7 +37,7 @@
3737
</plugin>
3838
<plugin name="PrettifyXML">
3939
<event value="FILE_PACK_UNPACK" />
40-
<description value="XML Prettier with tidy-html5. &#xD;&#xA;Arguments: Command line options passed to the tidy command." />
40+
<description value="XML Prettier (tidy-html5).&#xD;&#xA;Arguments: tidy command line options." />
4141
<file-filters value="\.xml$" />
4242
<is-automatic value="false" />
4343
<unpacked-file-extension value=".xml" />
@@ -49,7 +49,7 @@
4949
</plugin>
5050
<plugin name="PrettifyJSON">
5151
<event value="FILE_PACK_UNPACK" />
52-
<description value="JSON Prettier with jq command. &#xD;&#xA;Arguments: Filter or command line options passed to the jq command." />
52+
<description value="JSON Prettier (jq).&#xD;&#xA;Arguments: jq filter/command line options." />
5353
<file-filters value="\.json$" />
5454
<is-automatic value="false" />
5555
<unpacked-file-extension value=".json" />
@@ -61,7 +61,7 @@
6161
</plugin>
6262
<plugin name="PrettifyYAML">
6363
<event value="FILE_PACK_UNPACK" />
64-
<description value="YAML Prettier with yq command. &#xD;&#xA;Arguments: Filter or command line options passed to the yq command." />
64+
<description value="YAML Prettier (yq).&#xD;&#xA;Arguments: yq filter/command line options." />
6565
<file-filters value="\.yaml$;\.yml$" />
6666
<is-automatic value="false" />
6767
<unpacked-file-extension value=".yaml" />
@@ -73,7 +73,7 @@
7373
</plugin>
7474
<plugin name="QueryCSV">
7575
<event value="FILE_PACK_UNPACK" />
76-
<description value="CSV Querier with q command. &#xD;&#xA;Arguments: SQL statement or command line options passed to the q command." />
76+
<description value="CSV Querier (q).&#xD;&#xA;Arguments: SQL statement/q options." />
7777
<file-filters value="\.csv$" />
7878
<is-automatic value="false" />
7979
<unpacked-file-extension value=".csv" />
@@ -85,7 +85,7 @@
8585
</plugin>
8686
<plugin name="QueryTSV">
8787
<event value="FILE_PACK_UNPACK" />
88-
<description value="TSV Querier with q command. &#xD;&#xA;Arguments: SQL statement or command line options passed to the q command." />
88+
<description value="TSV Querier (q).&#xD;&#xA;Arguments: SQL statement/q options." />
8989
<file-filters value="\.tsv$" />
9090
<is-automatic value="false" />
9191
<unpacked-file-extension value=".tsv" />
@@ -97,7 +97,7 @@
9797
</plugin>
9898
<plugin name="QueryJSON">
9999
<event value="FILE_PACK_UNPACK" />
100-
<description value="JSON Querier with jq command. &#xD;&#xA;Arguments: Filter or command line options passed to the jq command." />
100+
<description value="JSON Querier (jq).&#xD;&#xA;Arguments: jq filter/command line options." />
101101
<file-filters value="\.json$" />
102102
<is-automatic value="false" />
103103
<unpacked-file-extension value=".json" />
@@ -109,7 +109,7 @@
109109
</plugin>
110110
<plugin name="QueryYAML">
111111
<event value="FILE_PACK_UNPACK" />
112-
<description value="YAML Querier with yq command. &#xD;&#xA;Arguments: Filter or command line options passed to the yq command." />
112+
<description value="YAML Querier (yq).&#xD;&#xA;Arguments: yq filter/command line options." />
113113
<file-filters value="\.yaml$;\.yml$" />
114114
<is-automatic value="false" />
115115
<unpacked-file-extension value=".yaml" />
@@ -121,7 +121,7 @@
121121
</plugin>
122122
<plugin name="ValidateHTML">
123123
<event value="FILE_PACK_UNPACK" />
124-
<description value="HTML Validator with tidy-html5. &#xD;&#xA;Arguments: Command line options passed to the tidy command." />
124+
<description value="HTML Validator (tidy-html5).&#xD;&#xA;Arguments: tidy command line options." />
125125
<file-filters value="\.html$;\.htm$" />
126126
<is-automatic value="false" />
127127
<unpacked-file-extension value=".html" />
@@ -133,7 +133,7 @@
133133
</plugin>
134134
<plugin name="PreviewGraphviz">
135135
<event value="FILE_PACK_UNPACK" />
136-
<description value="Graphviz Previewer. &#xD;&#xA;Arguments: Command line options passed to the dot command." />
136+
<description value="Graphviz Previewer.&#xD;&#xA;Arguments: dot command line options." />
137137
<file-filters value="\.gv;$\.dot$" />
138138
<is-automatic value="false" />
139139
<unpacked-file-extension value=".png" />
@@ -145,7 +145,7 @@
145145
</plugin>
146146
<plugin name="PreviewMarkdown">
147147
<event value="FILE_PACK_UNPACK" />
148-
<description value="Markdown Previewer. &#xD;&#xA;Arguments: Command line options passed to the md2html command." />
148+
<description value="Markdown Previewer.&#xD;&#xA;Arguments: md2html command line options." />
149149
<file-filters value="\.md$;\.markdown$" />
150150
<is-automatic value="false" />
151151
<unpacked-file-extension value=".html" />
@@ -157,7 +157,7 @@
157157
</plugin>
158158
<plugin name="PreviewPlantUML">
159159
<event value="FILE_PACK_UNPACK" />
160-
<description value="PlantUML Previewer. &#xD;&#xA;Arguments: Command line options passed to the plantuml.jar command." />
160+
<description value="PlantUML Previewer.&#xD;&#xA;Arguments: plantuml.jar command line options." />
161161
<file-filters value="\.pu$;\.puml$" />
162162
<is-automatic value="false" />
163163
<unpacked-file-extension value=".png" />
@@ -169,7 +169,7 @@
169169
</plugin>
170170
<plugin name="ApacheTika">
171171
<event value="FILE_PACK_UNPACK" />
172-
<description value="General content extractor with Apache Tika. &#xD;&#xA;Arguments: Command line options passed to the tika-app.jar." />
172+
<description value="Content extractor (Apache Tika).&#xD;&#xA;Arguments: tika-app.jar command line options." />
173173
<file-filters value="\.*$" />
174174
<is-automatic value="false" />
175175
<unpacked-file-extension value=".txt" />
@@ -181,7 +181,7 @@
181181
</plugin>
182182
<plugin name="DisassembleJVM">
183183
<event value="FILE_PACK_UNPACK" />
184-
<description value="JVM bytecode disassembler with javap. &#xD;&#xA;Arguments: Command line options passed to the javap command." />
184+
<description value="JVM bytecode disassembler (javap).&#xD;&#xA;Arguments: javap command line options." />
185185
<file-filters value="\.class$" />
186186
<is-automatic value="false" />
187187
<unpacked-file-extension value=".txt" />
@@ -193,7 +193,7 @@
193193
</plugin>
194194
<plugin name="DisassembleIL">
195195
<event value="FILE_PACK_UNPACK" />
196-
<description value="IL disassembler with ildasm. &#xD;&#xA;Arguments: Command line options passed to the ildasm command." />
196+
<description value="IL disassembler (ildasm).&#xD;&#xA;Arguments: ildasm command line options." />
197197
<file-filters value="\.obj$;\.lib$;\.winmd$;\.exe$;\.dll$" />
198198
<is-automatic value="false" />
199199
<unpacked-file-extension value=".asm" />
@@ -205,7 +205,7 @@
205205
</plugin>
206206
<plugin name="DisassembleNative">
207207
<event value="FILE_PACK_UNPACK" />
208-
<description value="Native code disassembler with dumpbin. &#xD;&#xA;Arguments: Command line options passed to the dumpbin command." />
208+
<description value="Native code disassembler (dumpbin).&#xD;&#xA;Arguments: dumpbin command line options." />
209209
<file-filters value="\.obj$;\.lib$;\.exe$;\.dll$" />
210210
<is-automatic value="false" />
211211
<unpacked-file-extension value=".asm" />

0 commit comments

Comments
 (0)