• R/O
  • HTTP
  • SSH
  • HTTPS

winmerge-jp: 提交


Commit MetaInfo

修訂c946ea08e2164021365966eb2ce17321596ad19e (tree)
時間2020-02-26 08:25:24
作者Takashi Sawanaka <sdottaka@user...>
CommiterTakashi Sawanaka

Log Message

Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# SetVersion.cmd
# Translations/WinMerge/Russian.po
# Version.h

Change Summary

差異

--- a/Docs/Manual/JP/Configuration.xml
+++ b/Docs/Manual/JP/Configuration.xml
@@ -26,7 +26,7 @@
2626
2727 <para>オプションダイアログには、多くのページがあり、それぞれ、関連する設定のグループを含んでいます。
2828 ダイアログの左端にある
29- <guilabel><!-- TODO: 日本語版確認 -->カテゴリ</guilabel>
29+ <guilabel>カテゴリ</guilabel>
3030 リストのタイトルをクリックすることで、ページを開くことができます。</para>
3131 </listitem>
3232
@@ -114,7 +114,7 @@
114114 <itemizedlist>
115115 <listitem>
116116 <para><option>無効</option>(デフォルト):
117- <!-- FIXME: イマイチ -->比較ウィンドウは、フォルダ、または、ファイルの先頭から開始します(差異は未選択)。</para>
117+ 比較ウィンドウは、フォルダ、または、ファイルの先頭を表示し、差異を選択しません。</para>
118118 </listitem>
119119
120120 <listitem>
@@ -259,7 +259,7 @@
259259 </section>
260260
261261 <section>
262- <title>起動時にファイルまたはフォルダの選択ダイアログを表示<indexterm>
262+ <title>起動時にファイルまたはフォルダの選択ダイアログを表示する<indexterm>
263263 <primary>Select Files or Folders dialog</primary>
264264
265265 <secondary>opening automatically</secondary>
@@ -283,17 +283,17 @@
283283 </section>
284284
285285 <section>
286- <title>Close "Select Files or Folders" Dialog on clicking OK button<indexterm>
286+ <title>OK押下時にファイルまたはフォルダの選択ダイアログを閉じる<indexterm>
287287 <primary>Select Files or Folders dialog</primary>
288288 </indexterm></title>
289289
290290 <itemizedlist>
291291 <listitem>
292- <para><option>Disabled</option> (default): TBD</para>
292+ <para><option>無効</option> (デフォルト): TBD</para>
293293 </listitem>
294294
295295 <listitem>
296- <para><option>Enabled</option>: TBD</para>
296+ <para><option>有効</option>: TBD</para>
297297 </listitem>
298298 </itemizedlist>
299299 </section>
@@ -630,23 +630,26 @@
630630
631631 <itemizedlist>
632632 <listitem>
633- <para><option>default</option> (default): The basic greedy diff
634- algorithm.</para>
633+ <para><option>default</option> (デフォルト):
634+ 基本的な差分アルゴリズムです。</para>
635635 </listitem>
636636
637637 <listitem>
638- <para><option>minimal</option>: Spend extra time to make sure the
639- smallest possible diff is produced.</para>
638+ <para><option>minimal</option>:
639+ できるだけ差分が少なくなるように比較します。
640+ その分、比較に時間がかかります。</para>
640641 </listitem>
641642
642643 <listitem>
643- <para><option>patience</option>: Use "patience diff" algorithm when
644- generating diff.</para>
644+ <para><option>patience</option>:
645+ patienceアルゴリズムで差分を比較します。</para>
645646 </listitem>
646647
647648 <listitem>
648- <para><option>histogram</option>: This algorithm extends the patience
649- algorithm to "support low-occurrence common elements".</para>
649+ <para><option>histogram</option>:
650+ histogramアルゴリズムで差分を比較します。
651+ このアルゴリズムはpatienceアルゴリズムを低頻度の共通要素に対応するように拡張しています。
652+ </para>
650653 </listitem>
651654 </itemizedlist>
652655 </section>
@@ -658,13 +661,13 @@
658661
659662 <itemizedlist>
660663 <listitem>
661- <para><option>Enabled</option> (default):
662- Enable the heuristic that shifts diff hunk boundaries to make diffs easier to read.
663- It has no effect if the Diff algorithm is default.</para>
664+ <para><option>有効</option> (デフォルト):
665+ 差分のハンク境界をシフトするヒューリスティックを有効にして、差分を読みやすくします。
666+ Diff アルゴリズムがdefaultの場合、効果はありません。</para>
664667 </listitem>
665668
666669 <listitem>
667- <para><option>Disabled</option> Disable the heuristic.</para>
670+ <para><option>無効</option> ヒューリスティックを無効にします。</para>
668671 </listitem>
669672 </itemizedlist>
670673 </section>
@@ -737,7 +740,7 @@
737740 </varlistentry>
738741
739742 <varlistentry>
740- <term>Binary Contents</term>
743+ <term>バイナリコンテンツ</term>
741744
742745 <listitem>
743746 <para>TBD</para>
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -1,3 +1,51 @@
1+WinMerge 2.16.6
2+ General:
3+ - Added CWindowsManagerDialog class for handling open tabs with Ctrl+Tab,
4+ now the application is behave just like professional editors
5+ (Visual Studio, Notepad++, etc.) to switch and activate the open tabs.
6+ (GitHub #247)
7+ File compare:
8+ - Bugfix: GhostTextBuffer: Don't unexpectedly bring back empty lines user
9+ wants to delete (GitHub #244)
10+ - Bugfix: Prevent silent abort with File Comparison of files whose size
11+ is an exact multiple of 2^32 bytes (GitHub #257)
12+ - Bugfix: WinMerge 2.16.4.0 crashes after de-selecting Split Vertically
13+ (GitHub #259)
14+ - Bugfix: "Replace All" may not replace all text
15+ - Bugfix: An error message is shown when pressing Enter key in Diff pane
16+ (osdn.net #39924)
17+ - Bugfix: Non-moved lines are treated as moved lines (osdn.net #39851)
18+ - Add support for touchpad horizontal scroll (GitHub #254)
19+ Image compare:
20+ - Bugfix: Support 16-bit images (GitHub WinMerge/winimerge issue #6)
21+ - Add support for SVG, PDF, WMF and EMF file types
22+ (Only available in WinMerge 64bit version on Windows 10)
23+ Demo1: https://gyazo.com/b605edb820bc52d0f4f6232eb8ad78aa
24+ Demo2: https://gyazo.com/f5f267546db27f2dc801c00df8cb4251
25+ Archive support:
26+ - Bugfix: Third tgz doesn't get fully extracted (first two do) (GitHub #263)
27+ Patch generator dialog:
28+ - Bugfix: Crash when generating patch for multiple files and a file only on
29+ one side (GitHub #252)
30+ Installer:
31+ - Bugfix: Fix spelling of Git (GitHub #246)
32+ Translations:
33+ - New translation: Arabic (sf.net #3038)
34+ - Translation updates:
35+ - Bulgarian (GitHub #236, #268)
36+ - French (GitHub #251)
37+ - German (GitHub #239, #245, #258)
38+ - Lithuanian (GitHub #233, #267)
39+ - Portuguese (GitHub #237)
40+ - Spanish (GitHub #266)
41+ Manual:
42+ - Bugfix: Fix spelling of Git (GitHub #246)
43+ - Update Configuration.xml (GitHub #262)
44+ Internals:
45+ - Consolidate FolderCmp (GitHub #240, #242)
46+ - Avoid some back and forth file path transcoding between UTF16 and UTF8
47+ (GitHub #243)
48+
149 WinMerge 2.16.5
250 File compare:
351 - Bugfix: Suspicious lack of Release() calls in lwdisp.c (GitHub #171)
@@ -16,6 +64,7 @@ WinMerge 2.16.5
1664 - Add support for color emoji (Only available in 64bit version)
1765 (To enable color emoji support, select DirectWrite* in Rendering
1866 mode combobox on Editor page in the Options dialog)
67+ Demo: https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4
1968 Folder compare:
2069 - Bugfix: Crash when clicking Next Difference button after unchecking
2170 Show Different Items menu item
--- a/Docs/Users/Contributors.txt
+++ b/Docs/Users/Contributors.txt
@@ -137,6 +137,7 @@ Localization:
137137 * Russian:
138138 Dmitriy S. Aleshkowskiy <wwarlock@mail.ru>
139139 Timon34
140+ wvxwxvw
140141
141142 * Serbian:
142143 Ozzii <ivanstar61@gmail.com>
@@ -156,6 +157,7 @@ Localization:
156157 Mario Angel <marioangel70@gmail.com>
157158 Jesús M. Delgado 'MacK' <nncsoft@yahoo.com>
158159 Dean Grimm <grimmdp@yahoo.com>
160+ borjafg
159161
160162 * Swedish:
161163 Hans Eriksson <hans.ericson@bredband.net>
@@ -220,7 +222,7 @@ Other Contributors (code, ideas, testing..):
220222 * Etienne Faisant
221223 * Bill Gord
222224 * H.Saido
223-
225+* Flaviu_
224226
225227 WinMerge includes code from:
226228 * Jared Breland <jbreland@legroom.net> (Installer's modpath script)
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -49,25 +49,89 @@
4949 </head>
5050 <body>
5151
52-<h2>WinMerge 2.16.5 Release Notes</h2>
52+<h2>WinMerge 2.16.6 Release Notes</h2>
5353 <ul>
5454 <li><a href="#about">About This Release</a></li>
55- <li><a href="#new2165">What Is New in 2.16.5?</a></li>
55+ <li><a href="#new2166">What Is New in 2.16.6?</a></li>
5656 <li><a href="#issues">Known Issues</a></li>
5757 </ul>
58-<p>December 2019</p>
58+<p>February 2020</p>
5959
6060 <h3><a name="about">About This Release</a></h3>
6161
6262 <p>
63-This is a WinMerge beta release which is meant for preview the current state of
64-WinMerge development. This release is not recommended for the production.
63+This is a WinMerge 2.16.6 stable release. This release replaces earlier WinMerge
64+stable releases as a recommended release.
6565 </p>
6666
6767 <p>
6868 Please submit bug reports to our <a href="http://github.com/winmerge/winmerge/issues">bug-tracker</a>.
6969 </p>
7070
71+<h3><a name="#new2166">What Is New in 2.16.6?</a></h3>
72+
73+<h4>General</h4>
74+<ul>
75+ <li>Added CWindowsManagerDialog class for handling open tabs with Ctrl+Tab, now the application is behave just like professional editors (Visual Studio, Notepad++, etc.) to switch and activate the open tabs. (GitHub #247)
76+ </li>
77+</ul>
78+
79+<h4>File compare</h4>
80+<ul>
81+ <li>Bugfix: GhostTextBuffer: Don't unexpectedly bring back empty lines user wants to delete (GitHub #244)</li>
82+ <li>Bugfix: Prevent silent abort with File Comparison of files whose size is an exact multiple of 2^32 bytes (GitHub #257)</li>
83+ <li>Bugfix: WinMerge 2.16.4.0 crashes after de-selecting Split Vertically (GitHub #259)</li>
84+ <li>Bugfix: "Replace All" may not replace all text</li>
85+ <li>Bugfix: An error message is shown when pressing Enter key in Diff pane (osdn.net #39924)</li>
86+ <li>Bugfix: Non-moved lines are treated as moved lines (osdn.net #39851)</li>
87+ <li>Add support for touchpad horizontal scroll (GitHub #254)</li>
88+</ul>
89+
90+<h4>Image compare</h4>
91+<ul>
92+ <li>Bugfix: Support 16-bit images (GitHub WinMerge/winimerge issue #6)</li>
93+ <li>Add support for SVG, PDF, WMF and EMF file types
94+ (Only available in WinMerge 64bit version on Windows 10)
95+ <a href="https://gyazo.com/b605edb820bc52d0f4f6232eb8ad78aa">Demo1</a>
96+ <a href="https://gyazo.com/f5f267546db27f2dc801c00df8cb4251">Demo2</a>
97+</ul>
98+
99+<h4>Archive support</h4>
100+<ul>
101+ <li>Bugfix: Third tgz doesn't get fully extracted (first two do) (GitHub #263)</li>
102+</ul>
103+
104+<h4>Patch generator dialog</h4>
105+<ul>
106+ <li>Bugfix: Crash when generating patch for multiple files and a file only on one side (GitHub #252)</li>
107+</ul>
108+
109+<h4>Installer</h4>
110+<ul>
111+ <li>Bugfix: Fix spelling of Git (GitHub #246)</li>
112+</ul>
113+
114+<h4>Translations</h4>
115+<ul>
116+ <li>New translation: Arabic (sf.net #3038)</li>
117+ <li>Translation updates:
118+ <ul>
119+ <li>Bulgarian (GitHub #236, #268)</li>
120+ <li>French (GitHub #251)</li>
121+ <li>German (GitHub #239, #245, #258)</li>
122+ <li>Lithuanian (GitHub #233, #267)</li>
123+ <li>Portuguese (GitHub #237)</li>
124+ <li>Spanish (GitHub #266)</li>
125+ </ul>
126+ </li>
127+</ul>
128+
129+<h4>Manual</h4>
130+<ul>
131+ <li>Bugfix: Fix spelling of Git (GitHub #246)</li>
132+ <li>Update Configuration.xml (GitHub #262)</li>
133+</ul>
134+
71135 <h3><a name="#new2165">What Is New in 2.16.5 Beta?</a></h3>
72136 <h4>File compare</h4>
73137 <ul>
@@ -79,7 +143,7 @@ Please submit bug reports to our <a href="http://github.com/winmerge/winmerge/is
79143 <li>Bugfix: Program is crashed! (GitHub #229)</li>
80144 <li>Switch "Find" buttons in Find dialog (GitHub #201)</li>
81145 <li>Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update </li>
82- <li>Add support for color emoji (Only available in 64bit version) To enable color emoji support, select DirectWrite* in Rendering mode combobox on Editor page in the Options dialog</li>
146+ <li>Add support for color emoji (Only available in 64bit version) To enable color emoji support, select DirectWrite* in Rendering mode combobox on Editor page in the Options dialog. <a href="https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4">Demo</a></li>
83147 </ul>
84148
85149 <h4>Folder compare</h4>
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -8,7 +8,7 @@ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900
88 https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900.1-x64.zip!Build\X64 ^
99 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.1-win32.zip!Build ^
1010 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.1-x64.zip!Build\X64 ^
11-https://github.com/WinMerge/winimerge/releases/download/1.0.14.0/winimerge-1-0-14-0-exe.zip!Build ^
11+https://github.com/WinMerge/winimerge/releases/download/1.0.15.0/winimerge-1-0-15-0-exe.zip!Build ^
1212 https://github.com/WinMerge/patch/releases/download/v2.5.9-7/patch-2.5.9-7-bin.zip!Build\GnuWin32 ^
1313 http://www.magicnotes.com/steelbytes/SBAppLocale_ENG.zip!Docs\Manual\Tools
1414
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -7,7 +7,7 @@ POCO: 1.4.3p1
77 boost: 1.72.0
88 frhed: 0.10904.2017.1
99 freeimage: 3.18.0
10-WinIMerge: 1.0.14.0
10+WinIMerge: 1.0.15.0
1111 Google C++ Testing Framework: 1.70
1212 GnuWin32 Patch for Windows: 2.5.9-7
1313 7-zip: 19.00
--- a/Externals/winimerge
+++ b/Externals/winimerge
@@ -1 +1 @@
1-Subproject commit 5212df14d871222f0fbd4b7d63b4af681257f21d
1+Subproject commit 745f7bf77bdd9c4ea3de1ee07020e7d2a9563ced
--- a/Plugins/src_VB/CompareMSExcelFiles/WinMergeScript.cls
+++ b/Plugins/src_VB/CompareMSExcelFiles/WinMergeScript.cls
@@ -59,7 +59,7 @@ Public Property Get PluginDescription() As String
5959 End Property
6060
6161 Public Property Get PluginFileFilters() As String
62- PluginFileFilters = "\.xls(\..*)?$;\.xlsx(\..*)?$;\.xlsm(\..*)?$;\.xlsb(\..*)?;\.xla(\..*)?$;\.xlax(\..*)?$"
62+ PluginFileFilters = "\.xls(\..*)?$;\.xlsx(\..*)?$;\.xlsm(\..*)?$;\.xlsb(\..*)?;\.xla(\..*)?$;\.xlam(\..*)?$"
6363 End Property
6464
6565 Public Property Get PluginIsAutomatic() As Boolean
--- a/SetVersion.cmd
+++ b/SetVersion.cmd
@@ -1,8 +1,8 @@
11 set MAJOR=2
22 set MINOR=16
3-set REVISION=4
4-set PATCHLEVEL=13
5-set STRPRIVATEBUILD="jp-13"
3+set REVISION=6
4+set PATCHLEVEL=1
5+set STRPRIVATEBUILD="jp-1"
66
77 set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
88 rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
--- a/Src/7zCommon.cpp
+++ b/Src/7zCommon.cpp
@@ -689,7 +689,7 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
689689 {
690690 VERIFY(::DeleteFile(res.files[2].c_str()) || (LogErrorString(strutils::format(_T("DeleteFile(%s) failed"), res.files[2])), false));
691691 }
692- BSTR pTmp = piHandler->GetDefaultName(hWnd, res.files[1].c_str());
692+ BSTR pTmp = piHandler->GetDefaultName(hWnd, res.files[2].c_str());
693693 res.files[2] = OLE2T(pTmp);
694694 SysFreeString(pTmp);
695695 res.files[2].insert(0, _T("\\"));
--- a/Src/Common/Bitmap.cpp
+++ b/Src/Common/Bitmap.cpp
@@ -56,9 +56,10 @@ void DrawBitmap(CDC *pDC, int x, int y, CBitmap *pBitmap)
5656 * @brief Duplicate a bitmap and make it dark
5757 * @param pDC [in] Device context
5858 * @param pBitmap [in] the bitmap to darken
59+ * @param lighten [in] make bitmap lighten if ligthen is true
5960 * @return The bitmap object
6061 */
61-CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap)
62+CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap, bool lighten)
6263 {
6364 CDC dcMem;
6465 dcMem.CreateCompatibleDC(pDC);
@@ -85,39 +86,77 @@ CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap)
8586 std::unique_ptr<BYTE[]> pbuf(new BYTE[bi.bmiHeader.biSizeImage]);
8687 GetDIBits(dcMem.m_hDC, (HBITMAP)*pBitmapDarkened, 0, bm.bmHeight, pbuf.get(), &bi, DIB_RGB_COLORS);
8788
88- int x;
89- for (x = 0; x < bm.bmWidth; x++)
89+ if (!lighten)
9090 {
91- double b = 0.85 + (0.10 * sin(acos((double)x/bm.bmWidth*2.0-1.0)));
92- for (int y = 1; y < bm.bmHeight-1; y++)
91+ for (int x = 0; x < bm.bmWidth; x++)
9392 {
94- int i = x * 4 + y * bm.bmWidth * 4;
95- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
96- pbuf[i+1] = (BYTE)(pbuf[i+1] * b);
97- pbuf[i+2] = (BYTE)(pbuf[i+2] * b);
93+ double b = 0.85 + (0.10 * sin(acos((double)x / bm.bmWidth*2.0 - 1.0)));
94+ for (int y = 1; y < bm.bmHeight - 1; y++)
95+ {
96+ int i = x * 4 + y * bm.bmWidth * 4;
97+ pbuf[i] = (BYTE)(pbuf[i] * 0.95);
98+ pbuf[i + 1] = (BYTE)(pbuf[i + 1] * b);
99+ pbuf[i + 2] = (BYTE)(pbuf[i + 2] * b);
100+ }
101+ }
102+ for (int x = 0; x < bm.bmWidth; x++)
103+ {
104+ int i = x * 4 + 0 * bm.bmWidth * 4;
105+ pbuf[i] = (BYTE)(pbuf[i] * 0.95);
106+ pbuf[i + 1] = (BYTE)(pbuf[i + 1] * 0.9);
107+ pbuf[i + 2] = (BYTE)(pbuf[i + 2] * 0.9);
108+ i = x * 4 + (bm.bmHeight - 1) * bm.bmWidth * 4;
109+ pbuf[i] = (BYTE)(pbuf[i] * 0.95);
110+ pbuf[i + 1] = (BYTE)(pbuf[i + 1] * 0.9);
111+ pbuf[i + 2] = (BYTE)(pbuf[i + 2] * 0.9);
112+ }
113+ for (int y = 0; y < bm.bmHeight; y++)
114+ {
115+ int i = 0 * 4 + y * bm.bmWidth * 4;
116+ pbuf[i] = (BYTE)(pbuf[i] * 0.95);
117+ pbuf[i + 1] = (BYTE)(pbuf[i + 1] * 0.9);
118+ pbuf[i + 2] = (BYTE)(pbuf[i + 2] * 0.9);
119+ i = (bm.bmWidth - 1) * 4 + y * bm.bmWidth * 4;
120+ pbuf[i] = (BYTE)(pbuf[i] * 0.95);
121+ pbuf[i + 1] = (BYTE)(pbuf[i + 1] * 0.9);
122+ pbuf[i + 2] = (BYTE)(pbuf[i + 2] * 0.9);
98123 }
99124 }
100- for (x = 0; x < bm.bmWidth; x++)
101- {
102- int i = x * 4 + 0 * bm.bmWidth * 4;
103- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
104- pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.9);
105- pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.9);
106- i = x * 4 + (bm.bmHeight-1) * bm.bmWidth * 4;
107- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
108- pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.9);
109- pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.9);
110- }
111- for (int y = 0; y < bm.bmHeight; y++)
125+ else
112126 {
113- int i = 0 * 4 + y * bm.bmWidth * 4;
114- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
115- pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.9);
116- pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.9);
117- i = (bm.bmWidth-1) * 4 + y * bm.bmWidth * 4;
118- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
119- pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.9);
120- pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.9);
127+ for (int x = 0; x < bm.bmWidth; x++)
128+ {
129+ int b = static_cast<int>(12.0 + (20.0 * sin(acos((double)x / bm.bmWidth*2.0 - 1.0))));
130+ for (int y = 1; y < bm.bmHeight - 1; y++)
131+ {
132+ int i = x * 4 + y * bm.bmWidth * 4;
133+ pbuf[i] = (BYTE)((std::min)(pbuf[i] + 40, 255));
134+ pbuf[i + 1] = (BYTE)((std::min)(pbuf[i + 1] + b, 255));
135+ pbuf[i + 2] = (BYTE)((std::min)(pbuf[i + 2] + b, 255));
136+ }
137+ }
138+ for (int x = 0; x < bm.bmWidth; x++)
139+ {
140+ int i = x * 4 + 0 * bm.bmWidth * 4;
141+ pbuf[i] = (BYTE)((std::min)(pbuf[i] + 40, 255));
142+ pbuf[i + 1] = (BYTE)((std::min)(pbuf[i + 1] + 32, 255));
143+ pbuf[i + 2] = (BYTE)((std::min)(pbuf[i + 2] + 32, 255));
144+ i = x * 4 + (bm.bmHeight - 1) * bm.bmWidth * 4;
145+ pbuf[i] = (BYTE)((std::min)(pbuf[i] + 40, 255));
146+ pbuf[i + 1] = (BYTE)((std::min)(pbuf[i + 1] + 32, 255));
147+ pbuf[i + 2] = (BYTE)((std::min)(pbuf[i + 2] + 32, 255));
148+ }
149+ for (int y = 0; y < bm.bmHeight; y++)
150+ {
151+ int i = 0 * 4 + y * bm.bmWidth * 4;
152+ pbuf[i] = (BYTE)((std::min)(pbuf[i] + 40, 255));
153+ pbuf[i + 1] = (BYTE)((std::min)(pbuf[i + 1] + 32, 255));
154+ pbuf[i + 2] = (BYTE)((std::min)(pbuf[i + 2] + 32, 255));
155+ i = (bm.bmWidth - 1) * 4 + y * bm.bmWidth * 4;
156+ pbuf[i] = (BYTE)((std::min)(pbuf[i] + 40, 255));
157+ pbuf[i + 1] = (BYTE)((std::min)(pbuf[i + 1] + 32, 255));
158+ pbuf[i + 2] = (BYTE)((std::min)(pbuf[i + 2] + 32, 255));
159+ }
121160 }
122161
123162 SetDIBits(dcMem.m_hDC, (HBITMAP)*pBitmapDarkened, 0, bm.bmHeight, pbuf.get(), &bi, DIB_RGB_COLORS);
--- a/Src/Common/Bitmap.h
+++ b/Src/Common/Bitmap.h
@@ -13,6 +13,6 @@ namespace ATL { class CImage; }
1313
1414 CBitmap *CopyRectToBitmap(CDC *pDC, const CRect & rect);
1515 void DrawBitmap(CDC *pDC, int x, int y, CBitmap *pBitmap);
16-CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap);
16+CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap, bool lighten = false);
1717 bool GrayScale(CBitmap *pBitmap);
1818 bool LoadImageFromResource(ATL::CImage& image, const TCHAR *pName, const TCHAR *pType);
--- a/Src/Common/UniFile.cpp
+++ b/Src/Common/UniFile.cpp
@@ -241,10 +241,10 @@ bool UniMemFile::DoOpen(const String& filename, AccessMode mode)
241241 return false;
242242 m_lineno = -1;
243243
244+#ifndef _WIN64
244245 unsigned sizehi = (unsigned)(m_filesize >> 32);
245246 unsigned sizelo = (unsigned)(m_filesize & 0xFFFFFFFF);
246247
247-#ifndef _WIN64
248248 if (sizehi || sizelo > 0x7FFFFFFF)
249249 {
250250 LastErrorCustom(_T("UniMemFile cannot handle files over 2 gigabytes"));
@@ -252,7 +252,7 @@ bool UniMemFile::DoOpen(const String& filename, AccessMode mode)
252252 }
253253 #endif
254254
255- if (sizelo == 0)
255+ if (m_filesize == 0)
256256 {
257257 // Allow opening empty file, but memory mapping doesn't work on such
258258 // m_base and m_current are 0 from the Close call above
--- a/Src/Diff3.h
+++ b/Src/Diff3.h
@@ -18,7 +18,7 @@ size_t Make3wayDiff(std::vector<Element>& diff3, const std::vector<Element>& dif
1818
1919 bool firstDiffBlockIsDiff12;
2020
21- Element dr3, dr10, dr12, dr10first, dr10last, dr12first, dr12last;
21+ Element dr3, dr10, dr12, dr10first, dr10last, dr12first, dr12last;
2222
2323 int linelast0 = 0;
2424 int linelast1 = 0;
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -147,7 +147,7 @@ BEGIN_MESSAGE_MAP(CImgMergeFrame, CMergeFrameCommon)
147147 ON_COMMAND(ID_IMG_USEBACKCOLOR, OnImgUseBackColor)
148148 ON_UPDATE_COMMAND_UI(ID_IMG_USEBACKCOLOR, OnUpdateImgUseBackColor)
149149 ON_COMMAND_RANGE(ID_IMG_VECTORIMAGESCALING_25, ID_IMG_VECTORIMAGESCALING_800, OnImgVectorImageScaling)
150- ON_UPDATE_COMMAND_UI_RANGE(ID_IMG_ZOOM_25, ID_IMG_ZOOM_800, OnUpdateImgVectorImageScaling)
150+ ON_UPDATE_COMMAND_UI_RANGE(ID_IMG_VECTORIMAGESCALING_25, ID_IMG_VECTORIMAGESCALING_800, OnUpdateImgVectorImageScaling)
151151 ON_COMMAND(ID_TOOLS_GENERATEREPORT, OnToolsGenerateReport)
152152 ON_COMMAND(ID_REFRESH, OnRefresh)
153153 ON_WM_SETFOCUS ()
--- a/Src/LocationView.cpp
+++ b/Src/LocationView.cpp
@@ -73,8 +73,6 @@ enum LOCBAR_TYPE
7373 BAR_YAREA, /**< Y-Coord in bar area */
7474 };
7575
76-const COLORREF clrBackground = RGB(0xe4, 0xe4, 0xf4);
77-
7876 /////////////////////////////////////////////////////////////////////////////
7977 // CLocationView
8078
@@ -175,6 +173,28 @@ BOOL CLocationView::OnEraseBkgnd(CDC* pDC)
175173 return FALSE;
176174 }
177175
176+static bool IsColorDark(COLORREF clrBackground)
177+{
178+ return !(GetRValue(clrBackground) >= 0x80 || GetGValue(clrBackground) >= 0x80 || GetBValue(clrBackground) >= 0x80);
179+
180+}
181+
182+COLORREF CLocationView::GetBackgroundColor()
183+{
184+ COLORREF clrBackground = GetDocument()->GetView(0, 0)->GetColor(COLORINDEX_WHITESPACE);
185+ if (!IsColorDark(clrBackground))
186+ {
187+ return RGB(
188+ (std::max)(GetRValue(clrBackground) - 24, 0),
189+ (std::max)(GetGValue(clrBackground) - 24, 0),
190+ (std::max)(GetBValue(clrBackground) - 12, 0));
191+ }
192+ return RGB(
193+ (std::min)(GetRValue(clrBackground) + 20, 255),
194+ (std::min)(GetGValue(clrBackground) + 20, 255),
195+ (std::min)(GetBValue(clrBackground) + 32, 255));
196+}
197+
178198 /**
179199 * @brief Draw custom (non-white) background.
180200 * @param [in] pDC Pointer to draw context.
@@ -182,7 +202,7 @@ BOOL CLocationView::OnEraseBkgnd(CDC* pDC)
182202 void CLocationView::DrawBackground(CDC* pDC)
183203 {
184204 // Set brush to desired background color
185- CBrush backBrush(clrBackground);
205+ CBrush backBrush(GetBackgroundColor());
186206
187207 // Save old brush
188208 CBrush* pOldBrush = pDC->SelectObject(&backBrush);
@@ -389,7 +409,7 @@ void CLocationView::OnDraw(CDC* pDC)
389409 CalculateBars();
390410 DrawBackground(&dc);
391411
392- COLORREF clrFace = clrBackground;
412+ COLORREF clrFace = GetBackgroundColor();
393413 COLORREF clrShadow = GetSysColor(COLOR_BTNSHADOW);
394414 COLORREF clrShadow2 = GetIntermediateColor(clrFace, clrShadow, 0.9f);
395415 COLORREF clrShadow3 = GetIntermediateColor(clrFace, clrShadow2, 0.5f);
@@ -961,7 +981,7 @@ void CLocationView::DrawVisibleAreaRect(CDC *pClientDC, int nTopLine, int nBotto
961981
962982 CRect rcVisibleArea(2, m_visibleTop, rc.right - 2, m_visibleBottom);
963983 std::unique_ptr<CBitmap> pBitmap(CopyRectToBitmap(pClientDC, rcVisibleArea));
964- std::unique_ptr<CBitmap> pDarkenedBitmap(GetDarkenedBitmap(pClientDC, pBitmap.get()));
984+ std::unique_ptr<CBitmap> pDarkenedBitmap(GetDarkenedBitmap(pClientDC, pBitmap.get(), IsColorDark(GetBackgroundColor())));
965985 DrawBitmap(pClientDC, rcVisibleArea.left, rcVisibleArea.top, pDarkenedBitmap.get());
966986 }
967987
--- a/Src/LocationView.h
+++ b/Src/LocationView.h
@@ -92,6 +92,7 @@ protected:
9292 void CalculateBlocks();
9393 void CalculateBlocksPixel(int nBlockStart, int nBlockEnd, int nBlockLength,
9494 int &nBeginY, int &nEndY);
95+ COLORREF GetBackgroundColor();
9596 void DrawBackground(CDC* pDC);
9697
9798 private:
--- a/Src/stringdiffs.cpp
+++ b/Src/stringdiffs.cpp
@@ -173,8 +173,8 @@ ComputeWordDiffs(int nFiles, const String str[3],
173173 else
174174 {
175175 std::vector<wdiff> diffs10, diffs12;
176- stringdiffs sdiffs10(str[1], str[0], case_sensitive, whitespace, breakType, &diffs10);
177- stringdiffs sdiffs12(str[1], str[2], case_sensitive, whitespace, breakType, &diffs12);
176+ stringdiffs sdiffs10(str[1], str[0], case_sensitive, 0, breakType, &diffs10);
177+ stringdiffs sdiffs12(str[1], str[2], case_sensitive, 0, breakType, &diffs12);
178178 // Hash all words in both lines and then compare them word by word
179179 // storing differences into m_wdiffs
180180 sdiffs10.BuildWordDiffList();
--- a/Testing/GoogleTest/GUITests/GUITestUtils.cpp
+++ b/Testing/GoogleTest/GUITests/GUITestUtils.cpp
@@ -157,6 +157,7 @@ const std::set<int> languages()
157157 return { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US) };
158158 return {
159159 MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
160+MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA),
160161 MAKELANGID(LANG_BULGARIAN, SUBLANG_DEFAULT),
161162 MAKELANGID(LANG_CATALAN, SUBLANG_DEFAULT),
162163 MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED),
--- a/Translations/ShellExtension/Russian.po
+++ b/Translations/ShellExtension/Russian.po
@@ -2,88 +2,89 @@
22 # Released under the "GNU General Public License"
33 #
44 # ID line follows -- this is updated by SVN
5-# $Id$
5+# $Id: $
66 #
77 msgid ""
88 msgstr ""
99 "Project-Id-Version: WinMerge Shell Extension\n"
1010 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
1111 "POT-Creation-Date: \n"
12-"PO-Revision-Date: \n"
13-"Last-Translator: \n"
12+"PO-Revision-Date: 20-02-25\n"
13+"Last-Translator: wvxwxvw\n"
1414 "Language-Team: Russian <winmerge-translate@lists.sourceforge.net>\n"
1515 "MIME-Version: 1.0\n"
1616 "Content-Type: text/plain; charset=UTF-8\n"
1717 "Content-Transfer-Encoding: 8bit\n"
18+"X-Poedit-Language: Russian\n"
1819 "X-Poedit-SourceCharset: UTF-8\n"
1920 "X-Poedit-Basepath: ../../ShellExtension/Languages\n"
2021 "Language: ru_RU\n"
2122 "X-Generator: Poedit 2.1.1\n"
2223
2324 #. AFX_TARG
24-#: ShellExtensionTemplate.rc:25
25+#: ShellExtensionTemplate.rc:24
2526 #, c-format
2627 msgid "AFX_TARG_ENU"
2728 msgstr "AFX_TARG_RUS"
2829
2930 #. LANGUAGE, SUBLANGUAGE
30-#: ShellExtensionTemplate.rc:27
31+#: ShellExtensionTemplate.rc:26
3132 #, c-format
3233 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
3334 msgstr "LANG_RUSSIAN, SUBLANG_DEFAULT"
3435
3536 #. Codepage
36-#: ShellExtensionTemplate.rc:28
37+#: ShellExtensionTemplate.rc:27
3738 #, c-format
3839 msgid "1252"
39-msgstr "65001"
40+msgstr ""
4041
41-#: ShellExtensionTemplate.rc:42
42+#: ShellExtensionTemplate.rc:41
4243 #, c-format
4344 msgid "ShellExtension"
4445 msgstr ""
4546
46-#: ShellExtensionTemplate.rc:43
47+#: ShellExtensionTemplate.rc:42
4748 #, c-format
4849 msgid "WinMerge"
49-msgstr "WinMerge"
50+msgstr ""
5051
51-#: ShellExtensionTemplate.rc:44
52+#: ShellExtensionTemplate.rc:43
5253 #, c-format
5354 msgid "Open with WinMerge"
54-msgstr "Открыть с помощью WinMerge"
55+msgstr "Открыть в WinMerge"
5556
56-#: ShellExtensionTemplate.rc:45
57+#: ShellExtensionTemplate.rc:44
5758 #, c-format
5859 msgid "Please select no more than 2 items"
5960 msgstr "Выберите не более 2 элементов"
6061
61-#: ShellExtensionTemplate.rc:46
62+#: ShellExtensionTemplate.rc:45
6263 #, c-format
6364 msgid "Compare"
64-msgstr "Сравнить"
65+msgstr "Сравнение"
6566
66-#: ShellExtensionTemplate.rc:47
67+#: ShellExtensionTemplate.rc:46
6768 #, c-format
6869 msgid "Compare..."
6970 msgstr "Сравнить..."
7071
71-#: ShellExtensionTemplate.rc:48
72+#: ShellExtensionTemplate.rc:47
7273 #, c-format
7374 msgid "Compare To"
7475 msgstr "Сравнить с"
7576
76-#: ShellExtensionTemplate.rc:49
77+#: ShellExtensionTemplate.rc:48
7778 #, c-format
7879 msgid "Save this path. Select another path to compare with this path."
79-msgstr "Сохранить этот путь и выбрать другой для сравнения с этим."
80+msgstr "Сохранить путь и выбрать второй."
8081
81-#: ShellExtensionTemplate.rc:50
82+#: ShellExtensionTemplate.rc:49
8283 #, c-format
8384 msgid "Compare to saved path (%1)"
84-msgstr "Сравнить с сохраненным путем (%1)"
85+msgstr "Сравнить с (%1)"
8586
86-#: ShellExtensionTemplate.rc:51
87+#: ShellExtensionTemplate.rc:50
8788 #, c-format
8889 msgid "Re-select First"
8990 msgstr "Выбрать заново"
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -87,10 +87,10 @@ msgid "&None"
8787 msgstr "&Няма"
8888
8989 msgid "&Vertical"
90-msgstr ""
90+msgstr "&Вертикал"
9191
9292 msgid "&Horizontal"
93-msgstr ""
93+msgstr "&Хоризонтал"
9494
9595 msgid "&Previous Page"
9696 msgstr "&Предишна страница"
@@ -325,13 +325,13 @@ msgid "Show &Right Only Different Items"
325325 msgstr "Показване само на уникалните от&дясно"
326326
327327 msgid "Show L&eft Only Missing Items"
328-msgstr ""
328+msgstr "Покажи само липсващите от ляво елементи"
329329
330330 msgid "Show Mi&ddle Only Missing Items"
331-msgstr ""
331+msgstr "Покажи само липсващите в средата елементи"
332332
333333 msgid "Show Rig&ht Only Missing Items"
334-msgstr ""
334+msgstr "Покажи само липсващите от дясно елементи"
335335
336336 msgid "Show Hidd&en Items"
337337 msgstr "Показване на &скритите елементи"
@@ -1138,16 +1138,16 @@ msgid "&Use folder compare colors"
11381138 msgstr ""
11391139
11401140 msgid "Items equal:"
1141-msgstr ""
1141+msgstr "Еднакви елементи:"
11421142
11431143 msgid "Items different:"
1144-msgstr ""
1144+msgstr "Различни елементи:"
11451145
11461146 msgid "Items not exists all:"
11471147 msgstr ""
11481148
11491149 msgid "Items filtered:"
1150-msgstr ""
1150+msgstr "Филтрирани елементи:"
11511151
11521152 msgid "System"
11531153 msgstr "Системни"
@@ -1695,7 +1695,7 @@ msgid "&Enable plugins"
16951695 msgstr "Включване на &добавките"
16961696
16971697 msgid "File filters:"
1698-msgstr ""
1698+msgstr "Филтри за файлове:"
16991699
17001700 msgid "Shell Integration"
17011701 msgstr "Сливане със системата"
@@ -1747,7 +1747,7 @@ msgid "&Binary compare limit (MB):"
17471747 msgstr "Ограничение на &двоичното сравняване (МБ):"
17481748
17491749 msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
1750-msgstr ""
1750+msgstr "\nБрой на нишки извършващи сравняване (отрицателна стойност се отнася за CPU ядра) "
17511751
17521752 msgctxt "Options dialog|Categories"
17531753 msgid "Binary"
@@ -2628,7 +2628,7 @@ msgstr "От ляво само: %1"
26282628
26292629 #, c-format
26302630 msgid "Middle only: %1"
2631-msgstr ""
2631+msgstr "Само в средата: %1"
26322632
26332633 #, c-format
26342634 msgid "Right only: %1"
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -174,7 +174,7 @@ msgid "&Set Background Color"
174174 msgstr "&Hintergrundfarbe setzen"
175175
176176 msgid "&Vector Image Scaling"
177-msgstr ""
177+msgstr "Vektorbild-Skalierung"
178178
179179 #, c-format
180180 msgid "&File"
@@ -1250,7 +1250,7 @@ msgstr "&Anzeige automatisch auf den ersten Unterschied positionieren"
12501250
12511251 #, c-format
12521252 msgid "Cl&ose windows with ESC:"
1253-msgstr "Fenster mit &Esc schließen:"
1253+msgstr "Fenster mit '&Esc' schließen:"
12541254
12551255 #, c-format
12561256 msgid "&Automatically verify paths in Open-dialog"
@@ -4109,8 +4109,8 @@ msgid "DirectWrite Natural Symmetric"
41094109 msgstr "DirectWrite natürlich symmetrisch"
41104110
41114111 msgid "MDI child window or main window"
4112-msgstr ""
4112+msgstr "MDI-Unter- oder MDI-Hauptfenster"
41134113
41144114 msgid "MDI child window only"
4115-msgstr ""
4115+msgstr "Nur MDI-Unterfenster"
41164116
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -11,8 +11,8 @@ msgid ""
1111 msgstr ""
1212 "Project-Id-Version: WinMerge\n"
1313 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
14-"POT-Creation-Date: 2019-11-12 11:12+0000\n"
15-"PO-Revision-Date: 2019-12-10 12:10+0300\n"
14+"POT-Creation-Date: 2020-01-19 21:36+0000\n"
15+"PO-Revision-Date: 2020-02-18 07:49+0300\n"
1616 "Last-Translator: Tichij <tichij@mail.com>\n"
1717 "Language-Team: Lithuanian <winmerge-translate@lists.sourceforge.net>\n"
1818 "Language: lt\n"
@@ -23,7 +23,7 @@ msgstr ""
2323 "X-Poedit-Language: Lithuanian\n"
2424 "X-Poedit-SourceCharset: UTF-8\n"
2525 "X-Poedit-Basepath: ../../Src/\n"
26-"X-Generator: Poedit 2.2.4\n"
26+"X-Generator: Poedit 2.3\n"
2727
2828 #. LANGUAGE, SUBLANGUAGE
2929 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
@@ -142,7 +142,7 @@ msgid "&Set Background Color"
142142 msgstr "Nu&statyti fono spalvą"
143143
144144 msgid "&Vector Image Scaling"
145-msgstr ""
145+msgstr "&Vektorinių vaizdų mąstelio keitimas"
146146
147147 msgid "&File"
148148 msgstr "&Failas"
@@ -2886,7 +2886,7 @@ msgid "G&oto Line %1"
28862886 msgstr "E&iti į %1 eilutę"
28872887
28882888 msgid "Disabled"
2889-msgstr "Išjungtas"
2889+msgstr "Išjungta"
28902890
28912891 msgid "From file system"
28922892 msgstr "Iš sistemos"
@@ -2974,8 +2974,8 @@ msgid "DirectWrite Natural Symmetric"
29742974 msgstr ""
29752975
29762976 msgid "MDI child window or main window"
2977-msgstr ""
2977+msgstr "MDI antrinį arba pagrindinį langą"
29782978
29792979 msgid "MDI child window only"
2980-msgstr ""
2980+msgstr "Tik MDI antrinį langą"
29812981
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -18,7 +18,7 @@ msgstr ""
1818 "POT-Creation-Date: \n"
1919 "PO-Revision-Date: 2020-02-04 20:55+0200\n"
2020 "Last-Translator: wvxwxvw\n"
21-"Language-Team: wvxwxvw <ru-board>\n"
21+"Language-Team: Russian <winmerge-translate@lists.sourceforge.net>\n"
2222 "MIME-Version: 1.0\n"
2323 "Content-Type: text/plain; charset=UTF-8\n"
2424 "Content-Transfer-Encoding: 8bit\n"
@@ -440,11 +440,11 @@ msgstr "Сохранить справа как..."
440440 msgid "&Print..."
441441 msgstr "&Печать..."
442442
443-msgid "Page Set&up"
443+msgid "Page Set&up..."
444444 msgstr "Параметры страницы..."
445445
446-msgid "Print Previe&w"
447-msgstr "Предпросмотр"
446+msgid "Print Previe&w..."
447+msgstr "Предпросмотр..."
448448
449449 msgid "&Convert Line Endings to"
450450 msgstr "&Заменить концы строк на"
@@ -468,7 +468,7 @@ msgid "&XML"
468468 msgstr "&XML"
469469
470470 msgid "&Binary"
471-msgstr "Бинарный"
471+msgstr "Двоичный"
472472
473473 msgid "&Image"
474474 msgstr "Изображение"
@@ -1600,7 +1600,7 @@ msgstr "&Отмена"
16001600 msgid "Test Filter"
16011601 msgstr "Тест фильтра"
16021602
1603-msgid "Testing filter ..."
1603+msgid "Testing filter..."
16041604 msgstr "Тестировать фильтр ..."
16051605
16061606 msgid "&Enter text to test:"
@@ -1706,16 +1706,16 @@ msgid "&Add to context menu"
17061706 msgstr "&Добавить в контекстное меню"
17071707
17081708 msgid "&Register shell extension"
1709-msgstr ""
1709+msgstr "Зарегистрировать shell"
17101710
17111711 msgid "&Unregister shell extension"
1712-msgstr ""
1712+msgstr "Удалить shell"
17131713
17141714 msgid "Register shell extension for current user &only"
1715-msgstr ""
1715+msgstr "Зарегистрировать shell для текущего пользователя"
17161716
17171717 msgid "Unregister shell extension for current user on&ly"
1718-msgstr ""
1718+msgstr "Удалить shell для текущего пользователя"
17191719
17201720 msgctxt "Options dialog|Categories"
17211721 msgid "Folder"
@@ -2384,7 +2384,7 @@ msgstr "Кодировка справа"
23842384 msgid "Middle Encoding"
23852385 msgstr "Кодировка посередине"
23862386
2387-msgid "Ignored Diff."
2387+msgid "Ignored Diff"
23882388 msgstr "Игнор. отличия"
23892389
23902390 msgctxt "DirView|ColumnHeader"
@@ -2975,3 +2975,4 @@ msgstr "MDI дочернее окно или главное окно"
29752975
29762976 msgid "MDI child window only"
29772977 msgstr "MDI дочернее окно только"
2978+
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1,5 +1,4 @@
1-# This file is part from WinMerge <https://winmerge.org/>
2-# Released under the "GNU General Public License"
1+# Released under the "GNU General Public License"
32 #
43 # Translators:
54 # * Dean Grimm <grimmdp at yahoo.com>
@@ -14,16 +13,16 @@ msgstr ""
1413 "Project-Id-Version: WinMerge\n"
1514 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
1615 "POT-Creation-Date: 2009-02-10 22:14+0000\n"
17-"PO-Revision-Date: 2011-09-21 21:52-0300\n"
16+"PO-Revision-Date: 2020-02-14 22:05+0100\n"
1817 "Last-Translator: Mario Angel <marioangel70 at gmail.com>\n"
1918 "Language-Team: Spanish <winmerge-translate@lists.sourceforge.net>\n"
2019 "MIME-Version: 1.0\n"
2120 "Content-Type: text/plain; charset=UTF-8\n"
2221 "Content-Transfer-Encoding: 8bit\n"
23-"X-Poedit-Language: Spanish\n"
2422 "X-Poedit-SourceCharset: UTF-8\n"
25-"X-Poedit-Basepath: ../../Src/\n"
26-"X-Poedit-Country: ARGENTINA\n"
23+"X-Poedit-Basepath: ../../Src\n"
24+"Language: es_AR\n"
25+"X-Generator: Poedit 2.3\n"
2726
2827 #. LANGUAGE, SUBLANGUAGE
2928 #, c-format
@@ -589,7 +588,7 @@ msgstr "Codi&ficación de archivo..."
589588
590589 #, c-format
591590 msgid "Recompare As"
592-msgstr ""
591+msgstr "Recomparar como"
593592
594593 #, c-format
595594 msgid "&Text"
@@ -813,11 +812,11 @@ msgstr ""
813812
814813 #, c-format
815814 msgid "Copy from Left\tAlt+Shift+Right"
816-msgstr ""
815+msgstr "Copiar desde izq.\tAlt+Shift+Der."
817816
818817 #, c-format
819818 msgid "Copy from Right\tAlt+Shift+Left"
820-msgstr ""
819+msgstr "Copiar desde der.\tAlt+Shift+Izq."
821820
822821 msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
823822 msgstr "Copiar al lado D&erecho y avanzar\tCtrl+Alt+Right"
@@ -1041,7 +1040,7 @@ msgstr "Menú Derecha"
10411040
10421041 #, c-format
10431042 msgid "Copy"
1044-msgstr ""
1043+msgstr "Copiar"
10451044
10461045 #, c-format
10471046 msgid "&Copy Full Path"
@@ -1125,7 +1124,7 @@ msgstr "Contenido rápido"
11251124
11261125 #, c-format
11271126 msgid "Binary Contents"
1128-msgstr ""
1127+msgstr "Contenidos binarios"
11291128
11301129 #, c-format
11311130 msgid "Modified Date"
@@ -1193,7 +1192,7 @@ msgstr ""
11931192
11941193 #, c-format
11951194 msgid "B&rowse..."
1196-msgstr "Examina&r"
1195+msgstr "Examina&r..."
11971196
11981197 #, c-format
11991198 msgid "&3rd File or Folder (Optional)"
@@ -1284,7 +1283,7 @@ msgstr "A&uto-completar en diálogos de apertura:"
12841283
12851284 #, c-format
12861285 msgid "Language:"
1287-msgstr ""
1286+msgstr "Idioma:"
12881287
12891288 #, c-format
12901289 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
@@ -1371,7 +1370,7 @@ msgstr "Reempl. Tod&o"
13711370
13721371 #, c-format
13731372 msgid "Markers"
1374-msgstr ""
1373+msgstr "Marcadores"
13751374
13761375 #, c-format
13771376 msgid "Enable &Markers"
@@ -1478,7 +1477,7 @@ msgid "Items not exists all:"
14781477 msgstr ""
14791478
14801479 msgid "Items filtered:"
1481-msgstr ""
1480+msgstr "Elementos filtrados:"
14821481
14831482 #, c-format
14841483 msgid "System"
@@ -1602,11 +1601,11 @@ msgstr "Detener"
16021601
16031602 #, c-format
16041603 msgid "Pause"
1605-msgstr ""
1604+msgstr "Pausar"
16061605
16071606 #, c-format
16081607 msgid "Continue"
1609-msgstr ""
1608+msgstr "Continuar"
16101609
16111610 #, c-format
16121611 msgid "Comparing items..."
@@ -1794,7 +1793,7 @@ msgstr "&Descartar cambios"
17941793
17951794 #, c-format
17961795 msgid "Middle side file"
1797-msgstr ""
1796+msgstr "Archivo del lado central"
17981797
17991798 #, c-format
18001799 msgid "Sa&ve changes"
@@ -1841,7 +1840,9 @@ msgstr ""
18411840 "se necesita reiniciar"
18421841
18431842 #, c-format
1844-msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
1843+msgid ""
1844+"Detect codepage for text files using mlang.dll\n"
1845+"need to restart session"
18451846 msgstr ""
18461847
18471848 #, c-format
@@ -1922,7 +1923,7 @@ msgstr ""
19221923
19231924 #, c-format
19241925 msgid "Search Marker:"
1925-msgstr ""
1926+msgstr "Marcador de búsqueda:"
19261927
19271928 #, c-format
19281929 msgid "User Defined Marker1:"
@@ -2030,7 +2031,7 @@ msgstr "Cerrar"
20302031
20312032 #, c-format
20322033 msgid "Middle:"
2033-msgstr ""
2034+msgstr "Centro:"
20342035
20352036 #, c-format
20362037 msgid "Missing Left:"
@@ -2121,7 +2122,7 @@ msgstr "Selección:"
21212122
21222123 #, c-format
21232124 msgid "Margin:"
2124-msgstr ""
2125+msgstr "Margen:"
21252126
21262127 #, c-format
21272128 msgid "Backup Files"
@@ -2196,7 +2197,7 @@ msgid "&Enable plugins"
21962197 msgstr "&Habilitar plugins"
21972198
21982199 msgid "File filters:"
2199-msgstr ""
2200+msgstr "Filtros de archivos:"
22002201
22012202 #, c-format
22022203 msgid "Shell Integration"
@@ -2259,7 +2260,9 @@ msgstr ""
22592260 msgid "&Binary compare limit (MB):"
22602261 msgstr ""
22612262
2262-msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
2263+msgid ""
2264+"\n"
2265+"&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
22632266 msgstr ""
22642267
22652268 msgctxt "Options dialog|Categories"
@@ -2322,16 +2325,28 @@ msgid "REC"
23222325 msgstr "REC"
23232326
23242327 #, c-format
2325-msgid "\nNew Documents (Ctrl+N)"
2328+msgid ""
2329+"\n"
2330+"New Documents (Ctrl+N)"
23262331 msgstr ""
2332+"\n"
2333+"Nuevos archivos (Ctrl+N)"
23272334
23282335 #, c-format
2329-msgid "\nOpen (Ctrl+O)"
2336+msgid ""
2337+"\n"
2338+"Open (Ctrl+O)"
23302339 msgstr ""
2340+"\n"
2341+"Abrir (Ctrl+O)"
23312342
23322343 #, c-format
2333-msgid "\nSave (Ctrl+S)"
2344+msgid ""
2345+"\n"
2346+"Save (Ctrl+S)"
23342347 msgstr ""
2348+"\n"
2349+"Guardar (Ctrl+S)"
23352350
23362351 #, c-format
23372352 msgid "Unknown error attempting to open project file"
@@ -2350,12 +2365,20 @@ msgid "Project file successfully saved."
23502365 msgstr "Archivo de proyecto guardado con éxito."
23512366
23522367 #, c-format
2353-msgid "\nUndo (Ctrl+Z)"
2368+msgid ""
2369+"\n"
2370+"Undo (Ctrl+Z)"
23542371 msgstr ""
2372+"\n"
2373+"Deshacer (Ctrl+Z)"
23552374
23562375 #, c-format
2357-msgid "\nRedo (Ctrl+Y)"
2376+msgid ""
2377+"\n"
2378+"Redo (Ctrl+Y)"
23582379 msgstr ""
2380+"\n"
2381+"Rehacer (Ctrl+Y)"
23592382
23602383 #, c-format
23612384 msgid ""
@@ -2393,7 +2416,9 @@ msgstr ""
23932416 "WinMerge.CompararCarpeta\n"
23942417 "Comparar Carpeta de WinMerge"
23952418
2396-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
2419+msgid ""
2420+"Developers:\n"
2421+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
23972422 msgstr ""
23982423 "Desarrolladores:\n"
23992424 "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
@@ -2460,10 +2485,10 @@ msgstr ""
24602485
24612486 #, c-format
24622487 msgid "Syntax"
2463-msgstr ""
2488+msgstr "Sintaxis"
24642489
24652490 msgid "Folder Compare"
2466-msgstr ""
2491+msgstr "Comparación de carpetas"
24672492
24682493 #, c-format
24692494 msgid "Differences"
@@ -2667,7 +2692,7 @@ msgstr "Sin título izquierda"
26672692
26682693 #, c-format
26692694 msgid "Untitled middle"
2670-msgstr ""
2695+msgstr "Sin título centro"
26712696
26722697 #, c-format
26732698 msgid "Untitled right"
@@ -2772,7 +2797,7 @@ msgstr ""
27722797
27732798 #, c-format
27742799 msgid "Only enabled for File comparisons"
2775-msgstr ""
2800+msgstr "Activar sólo para comparar archivos"
27762801
27772802 #, c-format
27782803 msgid "Cannot compare file and folder!"
@@ -2841,7 +2866,13 @@ msgstr ""
28412866 "¿Continuar de todas formas?"
28422867
28432868 #, c-format
2844-msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
2869+msgid ""
2870+"Saving file failed.\n"
2871+"%1\n"
2872+"%2\n"
2873+"Do you want to:\n"
2874+"\t- use a different filename (Press Ok)\n"
2875+"\t- abort the current operation (Press Cancel)?"
28452876 msgstr ""
28462877 "Error al guardar archivo.\n"
28472878 "%1\n"
@@ -2920,7 +2951,7 @@ msgstr "Guardar lado izquierdo como"
29202951
29212952 #, c-format
29222953 msgid "Save Middle File As"
2923-msgstr ""
2954+msgstr "Guardar lado central como"
29242955
29252956 #, c-format
29262957 msgid "Save Right File As"
@@ -2958,15 +2989,15 @@ msgstr "Lado derecho a lado izquierdo (%1)"
29582989
29592990 #, c-format
29602991 msgid "Right to Middle (%1)"
2961-msgstr ""
2992+msgstr "Lado derecho a lado central (%1)"
29622993
29632994 #, c-format
29642995 msgid "Middle to Left (%1)"
2965-msgstr ""
2996+msgstr "Lado central a lado izquierdo (%1)"
29662997
29672998 #, c-format
29682999 msgid "Middle to Right (%1)"
2969-msgstr ""
3000+msgstr "Lado central a lado derecho (%1)"
29703001
29713002 #, c-format
29723003 msgid "Left to Right (%1)"
@@ -2974,7 +3005,7 @@ msgstr "Lado izquierdo a lado derecho (%1)"
29743005
29753006 #, c-format
29763007 msgid "Left to Middle (%1)"
2977-msgstr ""
3008+msgstr "Lado izquierdo a lado central (%1)"
29783009
29793010 #, c-format
29803011 msgid "Left to... (%1)"
@@ -2982,7 +3013,7 @@ msgstr "Lado izquierdo a... (%1)"
29823013
29833014 #, c-format
29843015 msgid "Middle to... (%1)"
2985-msgstr ""
3016+msgstr "Lado central a... (%1)"
29863017
29873018 #, c-format
29883019 msgid "Right to... (%1)"
@@ -3006,7 +3037,7 @@ msgstr "Lado izquierdo (%1)"
30063037
30073038 #, c-format
30083039 msgid "Middle (%1)"
3009-msgstr ""
3040+msgstr "Lado central (%1)"
30103041
30113042 #, c-format
30123043 msgid "Right (%1)"
@@ -3026,7 +3057,7 @@ msgstr "Izquierda - Seleccione carpeta destino:"
30263057
30273058 #, c-format
30283059 msgid "Middle side - select destination folder:"
3029-msgstr ""
3060+msgstr "Centro - Seleccione carpeta destino:"
30303061
30313062 #, c-format
30323063 msgid "Right side - select destination folder:"
@@ -3090,7 +3121,7 @@ msgstr "Confirmar Movimiento"
30903121
30913122 #, c-format
30923123 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
3093-msgstr ""
3124+msgstr "Vas a cerrar la ventana que está comparando carpetas. ¿Seguro que quieres cerrar la ventana?"
30943125
30953126 #, c-format
30963127 msgid "Failed to execute external editor: %1"
@@ -3245,19 +3276,19 @@ msgstr "Carpeta omitida"
32453276
32463277 #, c-format
32473278 msgid "Left only: %1"
3248-msgstr "Sólo Izquierda: %1"
3279+msgstr "Sólo izquierda: %1"
32493280
32503281 #, c-format
32513282 msgid "Middle only: %1"
3252-msgstr ""
3283+msgstr "Sólo centro: %1"
32533284
32543285 #, c-format
32553286 msgid "Right only: %1"
3256-msgstr "Sólo Derecha: %1"
3287+msgstr "Sólo derecha: %1"
32573288
32583289 #, c-format
32593290 msgid "Does not exist in %1"
3260-msgstr ""
3291+msgstr "No existe en %1"
32613292
32623293 #, c-format
32633294 msgid "Binary files are identical"
@@ -3277,27 +3308,27 @@ msgstr "Las carpetas son diferentes"
32773308
32783309 #, c-format
32793310 msgid "Left Only"
3280-msgstr "Sólo Izquierda"
3311+msgstr "Sólo izquierda"
32813312
32823313 #, c-format
32833314 msgid "Right Only"
3284-msgstr "Sólo Derecha"
3315+msgstr "Sólo derecha"
32853316
32863317 #, c-format
32873318 msgid "Middle Only"
3288-msgstr ""
3319+msgstr "Sólo centro"
32893320
32903321 #, c-format
32913322 msgid "No item in left"
3292-msgstr ""
3323+msgstr "Sin elemento a la izquierda"
32933324
32943325 #, c-format
32953326 msgid "No item in right"
3296-msgstr ""
3327+msgstr "Sin elemento a la derecha"
32973328
32983329 #, c-format
32993330 msgid "No item in middle"
3300-msgstr ""
3331+msgstr "Sin elemento en el centro"
33013332
33023333 #, c-format
33033334 msgid "Error"
@@ -3309,15 +3340,15 @@ msgstr "Los archivos son iguales"
33093340
33103341 #, c-format
33113342 msgid "(Middle and right are identical)"
3312-msgstr ""
3343+msgstr "(Central y der. son idénticos)"
33133344
33143345 #, c-format
33153346 msgid "(Left and right are identical)"
3316-msgstr ""
3347+msgstr "(Izq. y der. son idénticos)"
33173348
33183349 #, c-format
33193350 msgid "(Left and middle are identical)"
3320-msgstr ""
3351+msgstr "(Izq. y central son idénticos)"
33213352
33223353 #, c-format
33233354 msgid "Text files are different"
@@ -3357,7 +3388,7 @@ msgstr "Fecha de modificación del archivo del lado derecho."
33573388
33583389 #, c-format
33593390 msgid "Middle side modification date."
3360-msgstr ""
3391+msgstr "Fecha de modificación del archivo del lado central."
33613392
33623393 #, c-format
33633394 msgid "File's extension."
@@ -3373,7 +3404,7 @@ msgstr "Tamaño del archivo del lado derecho en bytes."
33733404
33743405 #, c-format
33753406 msgid "Middle file size in bytes."
3376-msgstr ""
3407+msgstr "Tamaño del archivo del lado central en bytes."
33773408
33783409 #, c-format
33793410 msgid "Left file size abbreviated."
@@ -3385,7 +3416,7 @@ msgstr "Tamaño del archivo del lado derecho abreviado."
33853416
33863417 #, c-format
33873418 msgid "Middle file size abbreviated."
3388-msgstr ""
3419+msgstr "Tamaño del archivo del lado central abreviado."
33893420
33903421 #, c-format
33913422 msgid "Left side creation time."
@@ -3397,7 +3428,7 @@ msgstr "Fecha de creación del archivo del lado derecho."
33973428
33983429 #, c-format
33993430 msgid "Middle side creation time."
3400-msgstr ""
3431+msgstr "Fecha de creación del archivo del lado central."
34013432
34023433 #, c-format
34033434 msgid "Tells which side has newer modification date."
@@ -3413,7 +3444,7 @@ msgstr "Versión del archivo del lado derecho, sólo para algunos tipos de archi
34133444
34143445 #, c-format
34153446 msgid "Middle side file version, only for some filetypes."
3416-msgstr ""
3447+msgstr "Versión del archivo del lado central, sólo para algunos tipos de archivo."
34173448
34183449 #, c-format
34193450 msgid "Short comparison result."
@@ -3421,15 +3452,15 @@ msgstr "Resultados de la comparación abreviados."
34213452
34223453 #, c-format
34233454 msgid "Left side attributes."
3424-msgstr "Attributos del archivo del lado izquierdo."
3455+msgstr "Atributos del archivo del lado izquierdo."
34253456
34263457 #, c-format
34273458 msgid "Right side attributes."
3428-msgstr "Attributos del archivo del lado derecho."
3459+msgstr "Atributos del archivo del lado derecho."
34293460
34303461 #, c-format
34313462 msgid "Middle side attributes."
3432-msgstr ""
3463+msgstr "Atributos del archivo del lado central."
34333464
34343465 msgid "Left side file EOL type."
34353466 msgstr "Tipo de EOL del archivo del lado izquierdo."
@@ -3438,7 +3469,7 @@ msgid "Right side file EOL type."
34383469 msgstr "Tipo de EOL del archivo del lado derecho."
34393470
34403471 msgid "Middle side file EOL type."
3441-msgstr ""
3472+msgstr "Tipo de EOL del archivo del lado central."
34423473
34433474 #, c-format
34443475 msgid "Left side encoding."
@@ -3450,7 +3481,7 @@ msgstr "Codificación del lado derecho."
34503481
34513482 #, c-format
34523483 msgid "Middle side encoding."
3453-msgstr ""
3484+msgstr "Codificación del lado central."
34543485
34553486 #, c-format
34563487 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
@@ -3482,7 +3513,7 @@ msgstr "HTML Simple"
34823513
34833514 #, c-format
34843515 msgid "Simple XML"
3485-msgstr "XML Simple "
3516+msgstr "XML Simple"
34863517
34873518 #, c-format
34883519 msgid "The report file already exists. Do you want to overwrite existing file?"
@@ -3506,11 +3537,11 @@ msgstr "El mismo archivo está abierto en ambos paneles."
35063537
35073538 #, c-format
35083539 msgid "The selected files are identical."
3509-msgstr "Los archivos seleccionados son iguales"
3540+msgstr "Los archivos seleccionados son iguales."
35103541
35113542 #, c-format
35123543 msgid "An error occurred while comparing the files."
3513-msgstr "Ocurrió un error cuando se estaban comparando los archivos"
3544+msgstr "Ocurrió un error cuando se estaban comparando los archivos."
35143545
35153546 #, c-format
35163547 msgid "Temporary files could not be created. Check your temporary path settings."
@@ -3554,22 +3585,25 @@ msgstr ""
35543585
35553586 #, c-format
35563587 msgid "Do you want to move to the next file?"
3557-msgstr ""
3588+msgstr "¿Quieres pasar al siguiente fichero?"
35583589
35593590 #, c-format
35603591 msgid "Do you want to move to the previous file?"
3561-msgstr ""
3592+msgstr "¿Quieres pasar al fichero anterior?"
35623593
35633594 #, c-format
35643595 msgid "Do you want to move to the next page?"
3565-msgstr ""
3596+msgstr "¿Quieres pasar a la siguiente página?"
35663597
35673598 #, c-format
35683599 msgid "Do you want to move to the previous page?"
3569-msgstr ""
3600+msgstr "¿Quieres pasar a la página anterior?"
35703601
35713602 #, c-format
3572-msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
3603+msgid ""
3604+"Different codepages found in left (cp%d) and right (cp%d) files.\n"
3605+"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
3606+"Would you like to treat both files as being in the default Windows codepage (recommended)?"
35733607 msgstr ""
35743608 "Las páginas de códigos son diferentes en el archivo de la izquierda (cp%d) y el de la derecha (cp%d).\n"
35753609 "Mostrar cada archivo en su página de códigos dará una mejor visualización, pero combinar/copiar sería peligroso.\n"
@@ -3612,8 +3646,12 @@ msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, pres
36123646 msgstr ""
36133647
36143648 #, c-format
3615-msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
3649+msgid ""
3650+"The number of automatically merged changes: %1\n"
3651+"The number of unresolved conflicts: %2"
36163652 msgstr ""
3653+"Número de cambios mezclados automáticamente: %1\n"
3654+"Número de conflictos sin resolver: %2"
36173655
36183656 #, c-format
36193657 msgid "The change of codepage has been merged"
@@ -3778,71 +3816,133 @@ msgid "Editor script"
37783816 msgstr "Editor de script"
37793817
37803818 #, c-format
3781-msgid "\nDifference in the Current Line"
3819+msgid ""
3820+"\n"
3821+"Difference in the Current Line"
37823822 msgstr ""
3823+"\n"
3824+"Diferencia en la línea actual"
37833825
37843826 #, c-format
3785-msgid "\nOptions"
3827+msgid ""
3828+"\n"
3829+"Options"
37863830 msgstr ""
3831+"\n"
3832+"Opciones"
37873833
37883834 #, c-format
3789-msgid "\nRefresh (F5)"
3835+msgid ""
3836+"\n"
3837+"Refresh (F5)"
37903838 msgstr ""
3839+"\n"
3840+"Actualizar (F5)"
37913841
37923842 #, c-format
3793-msgid "\nPrevious Difference (Alt+Up)"
3843+msgid ""
3844+"\n"
3845+"Previous Difference (Alt+Up)"
37943846 msgstr ""
3847+"\n"
3848+"Diferencia previa (Alt+Abajo)"
37953849
37963850 #, c-format
3797-msgid "\nNext Difference (Alt+Down)"
3851+msgid ""
3852+"\n"
3853+"Next Difference (Alt+Down)"
37983854 msgstr ""
3855+"\n"
3856+"Siguiente diferencia (Alt+Abajo)"
37993857
38003858 #, c-format
3801-msgid "\nPrevious Conflict (Alt+Shift+Up)"
3859+msgid ""
3860+"\n"
3861+"Previous Conflict (Alt+Shift+Up)"
38023862 msgstr ""
3863+"\n"
3864+"Conflicto previo (Alt+Shift+Arriba)"
38033865
38043866 #, c-format
3805-msgid "\nNext Conflict (Alt+Shift+Down)"
3867+msgid ""
3868+"\n"
3869+"Next Conflict (Alt+Shift+Down)"
38063870 msgstr ""
3871+"\n"
3872+"Siguiente conflicto (Alt+Shift+Abajo)"
38073873
38083874 #, c-format
3809-msgid "\nFirst Difference (Alt+Home)"
3875+msgid ""
3876+"\n"
3877+"First Difference (Alt+Home)"
38103878 msgstr ""
3879+"\n"
3880+"Primera diferencia (Alt+Home)"
38113881
38123882 #, c-format
3813-msgid "\nCurrent Difference (Alt+Enter)"
3883+msgid ""
3884+"\n"
3885+"Current Difference (Alt+Enter)"
38143886 msgstr ""
3887+"\n"
3888+"Diferencia actual (Alt+Intro)"
38153889
38163890 #, c-format
3817-msgid "\nLast Difference (Alt+End)"
3891+msgid ""
3892+"\n"
3893+"Last Difference (Alt+End)"
38183894 msgstr ""
3895+"\n"
3896+"Última diferencia (Alt+Fin)"
38193897
38203898 #, c-format
3821-msgid "\nCopy Right (Alt+Right)"
3899+msgid ""
3900+"\n"
3901+"Copy Right (Alt+Right)"
38223902 msgstr ""
3903+"\n"
3904+"Copiar a la der. (Alt+Der.)"
38233905
38243906 #, c-format
3825-msgid "\nCopy Left (Alt+Left)"
3907+msgid ""
3908+"\n"
3909+"Copy Left (Alt+Left)"
38263910 msgstr ""
3911+"\n"
3912+"Copiar a la izq. (Alt+Izq.)"
38273913
38283914 #, c-format
3829-msgid "\nCopy Right and Advance (Ctrl+Alt+Right)"
3915+msgid ""
3916+"\n"
3917+"Copy Right and Advance (Ctrl+Alt+Right)"
38303918 msgstr ""
3919+"\n"
3920+"Copiar a la der. y avanzar (Ctrl+Alt+Der.)"
38313921
38323922 #, c-format
3833-msgid "\nCopy Left and Advance (Ctrl+Alt+Left)"
3923+msgid ""
3924+"\n"
3925+"Copy Left and Advance (Ctrl+Alt+Left)"
38343926 msgstr ""
3927+"\n"
3928+"Copiar a la izq. y avanzar (Ctrl+Alt+Izq.)"
38353929
38363930 #, c-format
3837-msgid "\nAll Right"
3931+msgid ""
3932+"\n"
3933+"All Right"
38383934 msgstr ""
38393935
38403936 #, c-format
3841-msgid "\nAll Left"
3937+msgid ""
3938+"\n"
3939+"All Left"
38423940 msgstr ""
38433941
38443942 #, c-format
3845-msgid "\nAuto Merge (Ctrl+Alt+M)"
3943+msgid ""
3944+"\n"
3945+"Auto Merge (Ctrl+Alt+M)"
38463946 msgstr ""
38473947
38483948 #, c-format
@@ -3867,15 +3967,17 @@ msgstr "Compilación Privada: %1"
38673967
38683968 #, c-format
38693969 msgid "Your software is up to date"
3870-msgstr ""
3970+msgstr "Tu programa está actualizado"
38713971
38723972 #, c-format
3873-msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"
3973+msgid ""
3974+"A new version of WinMerge is available.\n"
3975+"%1 is now available (you have %2). Would you like to download it now?"
38743976 msgstr ""
38753977
38763978 #, c-format
38773979 msgid "Failed to download latest version information"
3878-msgstr ""
3980+msgstr "Error al descarga la información de la última versión"
38793981
38803982 #, c-format
38813983 msgid "Plugin Settings"
@@ -3918,7 +4020,7 @@ msgid "Batch"
39184020 msgstr "Batch"
39194021
39204022 msgid "Lua"
3921-msgstr ""
4023+msgstr "Lua"
39224024
39234025 #, c-format
39244026 msgid "Portable Object"
@@ -3962,10 +4064,13 @@ msgstr ""
39624064
39634065 #, c-format
39644066 msgid "Failed to create folder."
3965-msgstr ""
4067+msgstr "Error al crear la carpeta."
39664068
39674069 #, c-format
3968-msgid "You can specify the following parameters to the path:\n$file: Path name of the current file\n$linenum: Line number of the current cursor position"
4070+msgid ""
4071+"You can specify the following parameters to the path:\n"
4072+"$file: Path name of the current file\n"
4073+"$linenum: Line number of the current cursor position"
39694074 msgstr ""
39704075
39714076 msgid "default"
--- a/Version.h
+++ b/Version.h
@@ -1,5 +1,5 @@
11 #define FILEVER 2,16,4,13
22 #define PRODUCTVER 2,16,4,13
3-#define STRFILEVER "2.16.4.13"
4-#define STRPRODUCTVER "2.16.4.13"
5-#define STRPRIVATEBUILD "jp-13"
3+#define STRFILEVER "2.16.6.1"
4+#define STRPRODUCTVER "2.16.6.1"
5+#define STRPRIVATEBUILD "jp-1"
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,9 +7,9 @@ install:
77 - ps: >-
88 Add-Content $ENV:UserProfile\Mercurial.ini "`r`n[extensions]`r`neol = "
99
10- (new-object net.webclient).DownloadFile('http://www.jrsoftware.org/download.php/is.exe#innosetup-6.0.2.exe', "$Env:APPVEYOR_BUILD_FOLDER/innosetup-6.0.2.exe")
10+ (new-object net.webclient).DownloadFile('http://www.jrsoftware.org/download.php/is.exe#innosetup-6.0.3.exe', "$Env:APPVEYOR_BUILD_FOLDER/innosetup-6.0.3.exe")
1111
12- & $Env:APPVEYOR_BUILD_FOLDER/innosetup-6.0.2.exe /verysilent /norestart /currentuser
12+ & $Env:APPVEYOR_BUILD_FOLDER/innosetup-6.0.3.exe /verysilent /norestart /currentuser
1313 cache:
1414 - build/WinMergeDownloadDeps
1515 build_script:
Show on old repository browser