winmerge-svn Mailing List for WinMerge (Page 106)

Windows visual diff and merge for files and directories

Brought to you by: christianlist, grimmdp

winmerge-svn — Subscribe to this list if you wish to receive notifications from Subversion

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (148)	Oct (84)	Nov (130)	Dec (121)
2007	Jan (89)	Feb (50)	Mar (81)	Apr (45)	May (42)	Jun (46)	Jul (40)	Aug (98)	Sep (80)	Oct (101)	Nov (128)	Dec (46)
2008	Jan (132)	Feb (117)	Mar (118)	Apr (112)	May (69)	Jun (140)	Jul (164)	Aug (159)	Sep (115)	Oct (65)	Nov (80)	Dec (128)
2009	Jan (145)	Feb (97)	Mar (118)	Apr (87)	May (96)	Jun (83)	Jul (50)	Aug (42)	Sep (18)	Oct (32)	Nov (12)	Dec (35)
2010	Jan (38)	Feb (8)	Mar (5)	Apr (19)	May (23)	Jun (39)	Jul (16)	Aug (4)	Sep (60)	Oct (100)	Nov (57)	Dec (43)
2011	Jan (25)	Feb (1)	Mar (3)	Apr	May (13)	Jun (19)	Jul	Aug (6)	Sep (5)	Oct (6)	Nov	Dec (1)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2013	Jan	Feb	Mar (19)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 104 105 106 107 108 .. 163 > >> (Page 106 of 163)

[Winmerge-svn] SF.net SVN: winmerge: [4957] trunk/Src/Languages

From: <ge...@us...> - 2008-01-24 23:23:29

Revision: 4957
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4957&view=rev
Author:   gerundt
Date:     2008-01-24 15:23:27 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
Fix archive bit trick for PO(T) scripts

Modified Paths:
--------------
    trunk/Src/Languages/CreateMasterPotFile.vbs
    trunk/Src/Languages/UpdatePoFilesFromPotFile.vbs

Modified: trunk/Src/Languages/CreateMasterPotFile.vbs
===================================================================
--- trunk/Src/Languages/CreateMasterPotFile.vbs	2008-01-24 22:15:03 UTC (rev 4956)
+++ trunk/Src/Languages/CreateMasterPotFile.vbs	2008-01-24 23:23:27 UTC (rev 4957)
@@ -33,7 +33,7 @@
 Sub Main
   Dim oStrings, sCodePage
   Dim StartTime, EndTime, Seconds
-  Dim bNecessary
+  Dim bNecessary, oFile
   
   StartTime = Time
   
@@ -50,6 +50,11 @@
     SetArchiveBit "../Merge.rc", False
     SetArchiveBit "English.pot", False
     SetArchiveBit "MergeLang.rc", False
+    For Each oFile In oFSO.GetFolder(".").Files 'For all files in the current folder...
+      If (LCase(oFSO.GetExtensionName(oFile.Name)) = "po") Then 'If a PO file...
+        oFile.Attributes = oFile.Attributes XOR 32 'Set archive bit!
+      End If
+    Next
     
     EndTime = Time
     Seconds = DateDiff("s", StartTime, EndTime)
@@ -356,7 +361,7 @@
       End If
     Else 'If archive bit NOT set...
       If (bValue = True) Then
-        oFile.Attributes = oFile.Attributes AND 32
+        oFile.Attributes = oFile.Attributes XOR 32
       End If
     End If
   End If

Modified: trunk/Src/Languages/UpdatePoFilesFromPotFile.vbs
===================================================================
--- trunk/Src/Languages/UpdatePoFilesFromPotFile.vbs	2008-01-24 22:15:03 UTC (rev 4956)
+++ trunk/Src/Languages/UpdatePoFilesFromPotFile.vbs	2008-01-24 23:23:27 UTC (rev 4957)
@@ -228,7 +228,7 @@
       End If
     Else 'If archive bit NOT set...
       If (bValue = True) Then
-        oFile.Attributes = oFile.Attributes AND 32
+        oFile.Attributes = oFile.Attributes XOR 32
       End If
     End If
   End If


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4956] trunk/Src

From: <ge...@us...> - 2008-01-24 22:15:12

Revision: 4956
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4956&view=rev
Author:   gerundt
Date:     2008-01-24 14:15:03 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
PATCH: [ 1879245 ] Delete unused resources

Modified Paths:
--------------
    trunk/Src/Languages/Brazilian.po
    trunk/Src/Languages/Bulgarian.po
    trunk/Src/Languages/Catalan.po
    trunk/Src/Languages/ChineseSimplified.po
    trunk/Src/Languages/ChineseTraditional.po
    trunk/Src/Languages/Croatian.po
    trunk/Src/Languages/Czech.po
    trunk/Src/Languages/Danish.po
    trunk/Src/Languages/Dutch.po
    trunk/Src/Languages/English.pot
    trunk/Src/Languages/French.po
    trunk/Src/Languages/German.po
    trunk/Src/Languages/Hungarian.po
    trunk/Src/Languages/Italian.po
    trunk/Src/Languages/Japanese.po
    trunk/Src/Languages/Korean.po
    trunk/Src/Languages/Norwegian.po
    trunk/Src/Languages/Polish.po
    trunk/Src/Languages/Portuguese.po
    trunk/Src/Languages/Russian.po
    trunk/Src/Languages/Slovak.po
    trunk/Src/Languages/Spanish.po
    trunk/Src/Languages/Swedish.po
    trunk/Src/Languages/Turkish.po
    trunk/Src/Merge.rc
    trunk/Src/resource.h

Modified: trunk/Src/Languages/Brazilian.po
===================================================================
--- trunk/Src/Languages/Brazilian.po	2008-01-24 21:45:40 UTC (rev 4955)
+++ trunk/Src/Languages/Brazilian.po	2008-01-24 22:15:03 UTC (rev 4956)
@@ -377,7 +377,7 @@
 #: Merge.rc:173
 #: Merge.rc:289
 #: Merge.rc:472
-#: Merge.rc:1887
+#: Merge.rc:1882
 #, c-format
 msgid "&Help"
 msgstr "A&juda"
@@ -713,7 +713,7 @@
 msgstr ""
 
 #: Merge.rc:364
-#: Merge.rc:2874
+#: Merge.rc:2863
 #, c-format
 msgid "< Empty >"
 msgstr ""
@@ -1234,7 +1234,7 @@
 msgstr "&Caminho para cleartool.exe:"
 
 #: Merge.rc:742
-#: Merge.rc:1895
+#: Merge.rc:1890
 #, c-format
 msgid "General"
 msgstr "Geral"
@@ -1412,7 +1412,7 @@
 msgstr "&Todos"
 
 #: Merge.rc:852
-#: Merge.rc:2123
+#: Merge.rc:2118
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
@@ -1469,7 +1469,7 @@
 msgstr ""
 
 #: Merge.rc:890
-#: Merge.rc:1898
+#: Merge.rc:1893
 #, c-format
 msgid "Colors"
 msgstr "Cores"
@@ -1544,7 +1544,7 @@
 msgstr "Di\xE1logo"
 
 #: Merge.rc:976
-#: Merge.rc:1901
+#: Merge.rc:1896
 #, c-format
 msgid "System"
 msgstr ""
@@ -1734,7 +1734,7 @@
 msgstr ""
 
 #: Merge.rc:1105
-#: Merge.rc:1848
+#: Merge.rc:1843
 #, c-format
 msgid "Stop"
 msgstr ""
@@ -1790,7 +1790,7 @@
 msgstr ""
 
 #: Merge.rc:1139
-#: Merge.rc:1896
+#: Merge.rc:1891
 #, c-format
 msgid "Compare"
 msgstr ""
@@ -1856,7 +1856,7 @@
 msgstr ""
 
 #: Merge.rc:1173
-#: Merge.rc:1897
+#: Merge.rc:1892
 #, c-format
 msgid "Editor"
 msgstr ""
@@ -1988,7 +1988,7 @@
 
 #: Merge.rc:1251
 #: Merge.rc:1499
-#: Merge.rc:1903
+#: Merge.rc:1898
 #, c-format
 msgid "Codepage"
 msgstr ""
@@ -2244,7 +2244,7 @@
 msgstr ""
 
 #: Merge.rc:1435
-#: Merge.rc:1904
+#: Merge.rc:1899
 #, c-format
 msgid "Archive Support"
 msgstr ""
@@ -2295,7 +2295,7 @@
 msgstr ""
 
 #: Merge.rc:1461
-#: Merge.rc:2271
+#: Merge.rc:2260
 #, c-format
 msgid "Different"
 msgstr ""
@@ -2327,7 +2327,7 @@
 msgstr ""
 
 #: Merge.rc:1479
-#: Merge.rc:2266
+#: Merge.rc:2255
 #, c-format
 msgid "Identical"
 msgstr "Id\xEAnticos"
@@ -2385,7 +2385,7 @@
 msgstr ""
 
 #: Merge.rc:1520
-#: Merge.rc:1870
+#: Merge.rc:1865
 #, c-format
 msgid "&Cancel"
 msgstr ""
@@ -2476,7 +2476,7 @@
 msgstr ""
 
 #: Merge.rc:1599
-#: Merge.rc:1905
+#: Merge.rc:1900
 #, c-format
 msgid "Backup Files"
 msgstr ""
@@ -2781,31 +2781,13 @@
 #: Merge.rc:1773
 #, c-format
 msgid ""
-"Open another window for the active document\n"
-"New Window"
-msgstr ""
-"Abre outra janela para o documento ativo\n"
-"Nova Janela"
-
-#: Merge.rc:1774
-#, c-format
-msgid ""
-"Arrange icons at the bottom of the window\n"
-"Arrange Icons"
-msgstr ""
-"Organiza os \xEDcones no fundo da janela\n"
-"Organiza os \xEDcones"
-
-#: Merge.rc:1775
-#, c-format
-msgid ""
 "Arrange windows so they overlap\n"
 "Cascade Windows"
 msgstr ""
 "Organiza as janelas de modo que elas se sobreponham\n"
 "Organiza em Cascata"
 
-#: Merge.rc:1776
+#: Merge.rc:1774
 #, fuzzy, c-format
 msgid ""
 "Arrange windows as non-overlapping tiles horizontally\n"
@@ -2814,7 +2796,7 @@
 "Organiza as janelas de modo que elas n\xE3o se sobreponham\n"
 "Organiza Horizontalmente"
 
-#: Merge.rc:1777
+#: Merge.rc:1775
 #, fuzzy, c-format
 msgid ""
 "Arrange windows as non-overlapping tiles vertically\n"
@@ -2823,43 +2805,16 @@
 "Organiza as janelas de modo que elas n\xE3o se sobreponham\n"
 "Organiza Verticalmente"
 
-#: Merge.rc:1778
+#: Merge.rc:1781
 #, c-format
 msgid ""
-"Split the active window into panes\n"
-"Split"
-msgstr ""
-"Divide a janela ativa em pain\xE9is\n"
-"Divide"
-
-#: Merge.rc:1784
-#, c-format
-msgid ""
-"Erase the selection\n"
-"Erase"
-msgstr ""
-"Apaga o texto selecionado\n"
-"Apaga"
-
-#: Merge.rc:1785
-#, c-format
-msgid ""
-"Erase everything\n"
-"Erase All"
-msgstr ""
-"Apaga tudo\n"
-"Apaga tudo"
-
-#: Merge.rc:1786
-#, c-format
-msgid ""
 "Copy the selection and put it on the Clipboard\n"
 "Copy"
 msgstr ""
 "Copia o texto selecionado e p\xF5e na \xE1rea de Transfer\xEAncia\n"
 "Copia"
 
-#: Merge.rc:1787
+#: Merge.rc:1782
 #, c-format
 msgid ""
 "Cut the selection and put it on the Clipboard\n"
@@ -2868,7 +2823,7 @@
 "Recorta a sele\xE7\xE3o e p\xF5e na \xE1rea de Transfer\xEAncia\n"
 "Recorta"
 
-#: Merge.rc:1788
+#: Merge.rc:1783
 #, c-format
 msgid ""
 "Find the specified text\n"
@@ -2877,7 +2832,7 @@
 "Procura o texto especificado\n"
 "Procura"
 
-#: Merge.rc:1789
+#: Merge.rc:1784
 #, c-format
 msgid ""
 "Insert Clipboard contents\n"
@@ -2886,7 +2841,7 @@
 "Insere conte\xFAdo da \xE1rea de Transfer\xEAncia\n"
 "Cola"
 
-#: Merge.rc:1790
+#: Merge.rc:1785
 #, c-format
 msgid ""
 "Repeat the last action\n"
@@ -2895,7 +2850,7 @@
 "Repete a \xFAltima a\xE7\xE3o\n"
 "Repetir"
 
-#: Merge.rc:1791
+#: Merge.rc:1786
 #, c-format
 msgid ""
 "Replace specific text with different text\n"
@@ -2904,7 +2859,7 @@
 "Substitui o texto especificado por outro\n"
 "Substitui"
 
-#: Merge.rc:1792
+#: Merge.rc:1787
 #, c-format
 msgid ""
 "Select the entire document\n"
@@ -2913,7 +2868,7 @@
 "Seleciona o documento inteiro\n"
 "Seleciona Tudo"
 
-#: Merge.rc:1793
+#: Merge.rc:1788
 #, c-format
 msgid ""
 "Undo the last action\n"
@@ -2922,7 +2877,7 @@
 "Desfaz a \xFAltima a\xE7\xE3o\n"
 "Desfaz"
 
-#: Merge.rc:1794
+#: Merge.rc:1789
 #, c-format
 msgid ""
 "Redo the previously undone action\n"
@@ -2931,7 +2886,7 @@
 "Refaz a \xFAltima a\xE7\xE3o desfeita\n"
 "Refaz"
 
-#: Merge.rc:1800
+#: Merge.rc:1795
 #, c-format
 msgid ""
 "Show or hide the toolbar\n"
@@ -2940,7 +2895,7 @@
 "Exibe ou esconde a barra de ferramentas\n"
 "Chavea Barra de Ferramentas"
 
-#: Merge.rc:1801
+#: Merge.rc:1796
 #, c-format
 msgid ""
 "Show or hide the status bar\n"
@@ -2949,69 +2904,69 @@
 "Exibe ou esconde a barra de status\n"
 "Chavea Barra de Status"
 
-#: Merge.rc:1802
+#: Merge.rc:1797
 #, c-format
 msgid ""
 "Show or hide the tab bar\n"
 "Toggle TabBar"
 msgstr ""
 
-#: Merge.rc:1803
+#: Merge.rc:1798
 #, c-format
 msgid "Automatically resize panes\nLock Panes"
 msgstr ""
 
-#: Merge.rc:1809
+#: Merge.rc:1804
 #, c-format
 msgid "Change the window size"
 msgstr "Altera o tamanho da janela"
 
-#: Merge.rc:1810
+#: Merge.rc:1805
 #, c-format
 msgid "Change the window position"
 msgstr "Altera a posi\xE7\xE3o da janela"
 
-#: Merge.rc:1811
+#: Merge.rc:1806
 #, c-format
 msgid "Reduce the window to an icon"
 msgstr "Reduz a janela a um \xEDcone"
 
-#: Merge.rc:1812
+#: Merge.rc:1807
 #, c-format
 msgid "Enlarge the window to full size"
 msgstr "Aumenta o tamnho da janela ao m\xE1ximo"
 
-#: Merge.rc:1813
+#: Merge.rc:1808
 #, c-format
 msgid "Switch to the next document window"
 msgstr "Ativa a pr\xF3xima janela"
 
-#: Merge.rc:1814
+#: Merge.rc:1809
 #, c-format
 msgid "Switch to the previous document window"
 msgstr "Ativa a janela anterior"
 
-#: Merge.rc:1815
+#: Merge.rc:1810
 #, c-format
 msgid "Close the active window and prompts to save the documents"
 msgstr "Fecha a janela ativa e pede para salvar os documentos"
 
-#: Merge.rc:1820
+#: Merge.rc:1815
 #, c-format
 msgid "Restore the window to normal size"
 msgstr "Restaurar o tamanho normal da janela"
 
-#: Merge.rc:1821
+#: Merge.rc:1816
 #, c-format
 msgid "Activate Task List"
 msgstr "Ativar Lista de Tarefas"
 
-#: Merge.rc:1822
+#: Merge.rc:1817
 #, c-format
 msgid "Activate this window"
 msgstr "Ativar esta janela"
 
-#: Merge.rc:1828
+#: Merge.rc:1823
 #, c-format
 msgid ""
 "Close print preview mode\n"
@@ -3020,7 +2975,7 @@
 "Fechar a visualiza\xE7\xE3o de impress\xE3o\n"
 "Cancelar Preview"
 
-#: Merge.rc:1835
+#: Merge.rc:1830
 #, c-format
 msgid ""
 "\n"
@@ -3032,175 +2987,175 @@
 "WinMerge Document"
 msgstr ""
 
-#: Merge.rc:1842
+#: Merge.rc:1837
 #, c-format
 msgid "Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1849
+#: Merge.rc:1844
 #, c-format
 msgid "Press any key"
 msgstr ""
 
-#: Merge.rc:1855
-#: Merge.rc:1856
+#: Merge.rc:1850
+#: Merge.rc:1851
 #, c-format
 msgid "Right click on the path to copy"
 msgstr ""
 
-#: Merge.rc:1862
+#: Merge.rc:1857
 #, c-format
 msgid ""
 "Developers:\n"
 "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
 msgstr ""
 
-#: Merge.rc:1863
+#: Merge.rc:1858
 #, c-format
 msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
 msgstr ""
 
-#: Merge.rc:1869
+#: Merge.rc:1864
 #, c-format
 msgid "&Ok"
 msgstr ""
 
-#: Merge.rc:1871
+#: Merge.rc:1866
 #, c-format
 msgid "&Abort"
 msgstr ""
 
-#: Merge.rc:1872
+#: Merge.rc:1867
 #, c-format
 msgid "&Retry"
 msgstr ""
 
-#: Merge.rc:1873
+#: Merge.rc:1868
 #, c-format
 msgid "&Ignore"
 msgstr ""
 
-#: Merge.rc:1874
+#: Merge.rc:1869
 #, c-format
 msgid "Ignore &all"
 msgstr ""
 
-#: Merge.rc:1875
+#: Merge.rc:1870
 #, c-format
 msgid "&Yes"
 msgstr ""
 
-#: Merge.rc:1881
+#: Merge.rc:1876
 #, c-format
 msgid "Yes to &all"
 msgstr ""
 
-#: Merge.rc:1882
+#: Merge.rc:1877
 #, c-format
 msgid "&No"
 msgstr ""
 
-#: Merge.rc:1883
+#: Merge.rc:1878
 #, c-format
 msgid "No to a&ll"
 msgstr ""
 
-#: Merge.rc:1884
+#: Merge.rc:1879
 #, c-format
 msgid "&Continue"
 msgstr ""
 
-#: Merge.rc:1885
+#: Merge.rc:1880
 #, c-format
 msgid "&Skip"
 msgstr ""
 
-#: Merge.rc:1886
+#: Merge.rc:1881
 #, c-format
 msgid "Skip &all"
 msgstr ""
 
-#: Merge.rc:1888
+#: Merge.rc:1883
 #, c-format
 msgid "Don't display this &message again."
 msgstr ""
 
-#: Merge.rc:1889
+#: Merge.rc:1884
 #, c-format
 msgid "Don't ask this &question again."
 msgstr ""
 
-#: Merge.rc:1899
+#: Merge.rc:1894
 #, c-format
 msgid "Syntax colors"
 msgstr ""
 
-#: Merge.rc:1900
+#: Merge.rc:1895
 #, c-format
 msgid "Text Colors"
 msgstr ""
 
-#: Merge.rc:1902
+#: Merge.rc:1897
 #, c-format
 msgid "Version Control"
 msgstr ""
 
-#: Merge.rc:1912
+#: Merge.rc:1907
 #, c-format
 msgid "To:"
 msgstr ""
 
-#: Merge.rc:1913
+#: Merge.rc:1908
 #, c-format
 msgid "From left:"
 msgstr ""
 
-#: Merge.rc:1914
+#: Merge.rc:1909
 #, c-format
 msgid "To left:"
 msgstr ""
 
-#: Merge.rc:1915
+#: Merge.rc:1910
 #, c-format
 msgid "From right:"
 msgstr ""
 
-#: Merge.rc:1916
+#: Merge.rc:1911
 #, c-format
 msgid "To right:"
 msgstr ""
 
-#: Merge.rc:1922
+#: Merge.rc:1917
 #, c-format
 msgid "Version %1"
 msgstr "Vers\xE3o %1 - Portugu\xE8s"
 
-#: Merge.rc:1923
+#: Merge.rc:1918
 #, c-format
 msgid "Unicode"
 msgstr ""
 
-#: Merge.rc:1929
+#: Merge.rc:1924
 #, c-format
 msgid "Options (%1)"
 msgstr "Op\xE7\xF5es (%1)"
 
-#: Merge.rc:1930
+#: Merge.rc:1925
 #, c-format
 msgid "All message boxes are now displayed again."
 msgstr ""
 
-#: Merge.rc:1931
+#: Merge.rc:1926
 #, c-format
 msgid "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
 msgstr "Altera\xE7\xF5es foram feitas no arquivo corrente nesta sess\xE3o de compara\xE7\xE3o. Alguns ajustes podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o ao atual arquivo seja reiniciada."
 
-#: Merge.rc:1932
+#: Merge.rc:1927
 #, c-format
 msgid "The selected font change will not be applied to any currently visible difference windows."
 msgstr "A altera\xE7\xE3o da fonte n\xE3o ser\xE1 aplicada a nenhuma das janelas que j\xE1 estejam abertas."
 
-#: Merge.rc:1934
+#: Merge.rc:1929
 #, c-format
 msgid ""
 "Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3208,7 +3163,7 @@
 "Please use values 1 - %1."
 msgstr ""
 
-#: Merge.rc:1936
+#: Merge.rc:1931
 #, c-format
 msgid ""
 "Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3216,107 +3171,107 @@
 "Please re-start WinMerge after the reset."
 msgstr ""
 
-#: Merge.rc:1942
+#: Merge.rc:1937
 #, c-format
 msgid "Open"
 msgstr "Abrir"
 
-#: Merge.rc:1943
+#: Merge.rc:1938
 #, c-format
 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1944
+#: Merge.rc:1939
 #, c-format
 msgid "All Files (*.*)|*.*||"
 msgstr "Todos Arquivos (*.*)|*.*||"
 
-#: Merge.rc:1945
+#: Merge.rc:1940
 #, c-format
 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
 msgstr ""
 
-#: Merge.rc:1947
+#: Merge.rc:1942
 #, c-format
 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1953
+#: Merge.rc:1948
 #, c-format
 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1954
+#: Merge.rc:1949
 #, c-format
 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1955
+#: Merge.rc:1950
 #, c-format
 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1961
+#: Merge.rc:1956
 #, c-format
 msgid "Full Contents"
 msgstr ""
 
-#: Merge.rc:1962
+#: Merge.rc:1957
 #, c-format
 msgid "Quick Contents"
 msgstr ""
 
-#: Merge.rc:1963
+#: Merge.rc:1958
 #, c-format
 msgid "Modified Date"
 msgstr ""
 
-#: Merge.rc:1964
+#: Merge.rc:1959
 #, c-format
 msgid "Modified Date and Size"
 msgstr ""
 
-#: Merge.rc:1965
+#: Merge.rc:1960
 #, c-format
 msgid "Size"
 msgstr ""
 
-#: Merge.rc:1971
+#: Merge.rc:1966
 #, c-format
 msgid "Name"
 msgstr ""
 
-#: Merge.rc:1972
+#: Merge.rc:1967
 #, c-format
 msgid "Location"
 msgstr ""
 
-#: Merge.rc:1973
+#: Merge.rc:1968
 #, c-format
 msgid "Filters"
 msgstr ""
 
-#: Merge.rc:1974
+#: Merge.rc:1969
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:1975
+#: Merge.rc:1970
 #, c-format
 msgid "Description"
 msgstr ""
 
-#: Merge.rc:1976
+#: Merge.rc:1971
 #, c-format
 msgid "Select filename for new filter"
 msgstr ""
 
-#: Merge.rc:1977
+#: Merge.rc:1972
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1979
+#: Merge.rc:1974
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3325,7 +3280,7 @@
 "%2."
 msgstr ""
 
-#: Merge.rc:1981
+#: Merge.rc:1976
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3334,7 +3289,7 @@
 "Please make sure the folder exists and is writable."
 msgstr ""
 
-#: Merge.rc:1983
+#: Merge.rc:1978
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3342,7 +3297,7 @@
 "Please select filter folder in Options/System."
 msgstr ""
 
-#: Merge.rc:1985
+#: Merge.rc:1980
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3351,12 +3306,12 @@
 "Maybe the file is read-only?"
 msgstr ""
 
-#: Merge.rc:1986
+#: Merge.rc:1981
 #, c-format
 msgid "Locate filter file to install"
 msgstr ""
 
-#: Merge.rc:1988
+#: Merge.rc:1983
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3364,208 +3319,208 @@
 "Could not copy new filter file to filter folder."
 msgstr ""
 
-#: Merge.rc:1990
+#: Merge.rc:1985
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr ""
 
-#: Merge.rc:1996
+#: Merge.rc:1991
 #, c-format
 msgid "Regular expression"
 msgstr ""
 
-#: Merge.rc:2002
+#: Merge.rc:1997
 #, c-format
 msgid "&Path to cleartool.exe :"
 msgstr "Camin&ho para o cleartool.exe :"
 
-#: Merge.rc:2003
+#: Merge.rc:1998
 #, c-format
 msgid "&Path to SS.EXE :"
 msgstr "Ca&minho para o SS.EXE :"
 
-#: Merge.rc:2009
+#: Merge.rc:2004
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultado da Compara\xE7\xE3o dos Diret\xF3rios"
 
-#: Merge.rc:2010
+#: Merge.rc:2005
 #, c-format
 msgid "File Comparison"
 msgstr "Compara\xE7\xE3o de Arquivo"
 
-#: Merge.rc:2011
+#: Merge.rc:2006
 #, c-format
 msgid "Untitled left"
 msgstr ""
 
-#: Merge.rc:2012
+#: Merge.rc:2007
 #, c-format
 msgid "Untitled right"
 msgstr ""
 
-#: Merge.rc:2013
+#: Merge.rc:2008
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2014
+#: Merge.rc:2009
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2020
+#: Merge.rc:2015
 #, c-format
 msgid "Scanning files..."
 msgstr "Explorando arquivos..."
 
-#: Merge.rc:2021
+#: Merge.rc:2016
 #, c-format
 msgid "Opening selection"
 msgstr "Abrindo sele\xE7\xE3o"
 
-#: Merge.rc:2022
+#: Merge.rc:2017
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Copiando da esquerda para direita"
 
-#: Merge.rc:2023
+#: Merge.rc:2018
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Copiando da direita para esquerda"
 
-#: Merge.rc:2024
+#: Merge.rc:2019
 #, c-format
 msgid "Copying All to Left"
 msgstr "Copiando tudo para esquerda"
 
-#: Merge.rc:2025
+#: Merge.rc:2020
 #, c-format
 msgid "Copying All to Right"
 msgstr "Copiando tudo para direita"
 
-#: Merge.rc:2026
+#: Merge.rc:2021
 #, c-format
 msgid "Copying files..."
 msgstr ""
 
-#: Merge.rc:2027
+#: Merge.rc:2022
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: Merge.rc:2028
+#: Merge.rc:2023
 #, c-format
 msgid "Moving files..."
 msgstr ""
 
-#: Merge.rc:2029
+#: Merge.rc:2024
 #, c-format
 msgid "Creating the report..."
 msgstr ""
 
-#: Merge.rc:2035
+#: Merge.rc:2030
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
-#: Merge.rc:2036
+#: Merge.rc:2031
 #, c-format
 msgid "Line: %s"
 msgstr ""
 
-#: Merge.rc:2037
+#: Merge.rc:2032
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
-#: Merge.rc:2038
+#: Merge.rc:2033
 #, c-format
 msgid "Merge"
 msgstr ""
 
-#: Merge.rc:2039
+#: Merge.rc:2034
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Diferen\xE7a %1 de %2"
 
-#: Merge.rc:2040
+#: Merge.rc:2035
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 Diferen\xE7as encontradas"
 
-#: Merge.rc:2041
+#: Merge.rc:2036
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 Diferen\xE7a encontrada"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2042
+#: Merge.rc:2037
 #, c-format
 msgid "RO"
 msgstr ""
 
-#: Merge.rc:2048
+#: Merge.rc:2043
 #, c-format
 msgid "Item %1 of %2"
 msgstr ""
 
-#: Merge.rc:2049
+#: Merge.rc:2044
 #, c-format
 msgid "Items: %1"
 msgstr ""
 
-#: Merge.rc:2055
+#: Merge.rc:2050
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Selecione dois diret\xF3rios ou arquivos existentes para comparar"
 
-#: Merge.rc:2056
+#: Merge.rc:2051
 #, c-format
 msgid "Folder Selection"
 msgstr "Directory Selection"
 
-#: Merge.rc:2057
+#: Merge.rc:2052
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Select two directories or two files to compare."
 
-#: Merge.rc:2058
+#: Merge.rc:2053
 #, c-format
 msgid "Left path is invalid!"
 msgstr ""
 
-#: Merge.rc:2059
+#: Merge.rc:2054
 #, c-format
 msgid "Right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2060
+#: Merge.rc:2055
 #, c-format
 msgid "Both paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2061
+#: Merge.rc:2056
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr ""
 
-#: Merge.rc:2062
+#: Merge.rc:2057
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Cannot compare file and directory!"
 
-#: Merge.rc:2068
+#: Merge.rc:2063
 #, c-format
 msgid "File not found: %1"
 msgstr "Arquivo n\xE3o encontrado: %1"
 
-#: Merge.rc:2069
+#: Merge.rc:2064
 #, c-format
 msgid "File not unpacked: %1"
 msgstr ""
 
-#: Merge.rc:2070
+#: Merge.rc:2065
 #, c-format
 msgid ""
 "%1\n"
@@ -3574,7 +3529,7 @@
 "are identical binary files."
 msgstr ""
 
-#: Merge.rc:2071
+#: Merge.rc:2066
 #, c-format
 msgid ""
 "%1\n"
@@ -3583,7 +3538,7 @@
 "are different binary files."
 msgstr ""
 
-#: Merge.rc:2072
+#: Merge.rc:2067
 #, c-format
 msgid ""
 "%1\n"
@@ -3591,7 +3546,7 @@
 "is binary file. Cannot compare binary and text files."
 msgstr ""
 
-#: Merge.rc:2073
+#: Merge.rc:2068
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -3600,37 +3555,37 @@
 "%2"
 msgstr ""
 
-#: Merge.rc:2074
+#: Merge.rc:2069
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2080
+#: Merge.rc:2075
 #, c-format
 msgid "Save As"
 msgstr "Salvar Como"
 
-#: Merge.rc:2081
+#: Merge.rc:2076
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Salvar altera\xE7\xF5es em %1?"
 
-#: Merge.rc:2082
+#: Merge.rc:2077
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 est\xE1 marcado somente-leitura.  Voc\xEA gostaria de salvar suas altera\xE7\xF5es com um nome de diferente?"
 
-#: Merge.rc:2083
+#: Merge.rc:2078
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Erro ao checar escrita no destino"
 
-#: Merge.rc:2084
+#: Merge.rc:2079
 #, c-format
 msgid "Error backing up file"
 msgstr "Erro ao realizar c\xF3pia de seguran\xE7a do arquivo"
 
-#: Merge.rc:2086
+#: Merge.rc:2081
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -3639,7 +3594,7 @@
 "Continue anyway?"
 msgstr ""
 
-#: Merge.rc:2087
+#: Merge.rc:2082
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -3650,7 +3605,7 @@
 "\t-abort the current operation (Press Cancel)?"
 msgstr ""
 
-#: Merge.rc:2088
+#: Merge.rc:2083
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3660,7 +3615,7 @@
 "Do you want to save the unpacked version to another file?"
 msgstr ""
 
-#: Merge.rc:2089
+#: Merge.rc:2084
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3670,7 +3625,7 @@
 "Do you want to save the unpacked version to another file?"
 msgstr ""
 
-#: Merge.rc:2090
+#: Merge.rc:2085
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -3680,14 +3635,14 @@
 "Overwrite changed file?"
 msgstr ""
 
-#: Merge.rc:2091
+#: Merge.rc:2086
 #, c-format
 msgid ""
 "%1\n"
 "is marked read-only. Would you like to override the read-only item?"
 msgstr ""
 
-#: Merge.rc:2092
+#: Merge.rc:2087
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -3697,17 +3652,17 @@
 "If you want to refresh files close current file compare and load files again."
 msgstr ""
 
-#: Merge.rc:2093
+#: Merge.rc:2088
 #, c-format
 msgid "Save Left File As"
 msgstr ""
 
-#: Merge.rc:2094
+#: Merge.rc:2089
 #, c-format
 msgid "Save Right File As"
 msgstr ""
 
-#: Merge.rc:2100
+#: Merge.rc:2095
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -3715,42 +3670,42 @@
 "Refresh documents before continuing."
 msgstr ""
 
-#: Merge.rc:2106
+#: Merge.rc:2101
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Voc\xEA precisa especificar o caminho de um projeto do SourceSafe para continuar (ex:  $/MyProject)"
 
-#: Merge.rc:2107
+#: Merge.rc:2102
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr ""
 
-#: Merge.rc:2108
+#: Merge.rc:2103
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "O SourceSafe retornou um erro ao tentar efetuar check out no arquivo.  Abortando..."
 
-#: Merge.rc:2109
+#: Merge.rc:2104
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Erro ao executar o comando do sistema de vers\xF5es."
 
-#: Merge.rc:2110
+#: Merge.rc:2105
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr ""
 
-#: Merge.rc:2111
+#: Merge.rc:2106
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr ""
 
-#: Merge.rc:2112
+#: Merge.rc:2107
 #, c-format
 msgid "Error from VSS:"
 msgstr ""
 
-#: Merge.rc:2113
+#: Merge.rc:2108
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -3758,224 +3713,178 @@
 " Undo checkout operation?"
 msgstr ""
 
-#: Merge.rc:2114
+#: Merge.rc:2109
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
 " Please, check config spec of used view. "
 msgstr ""
 
-#: Merge.rc:2120
-#: Merge.rc:2910
+#: Merge.rc:2115
+#: Merge.rc:2899
 #, c-format
 msgid "None"
 msgstr ""
 
-#: Merge.rc:2121
+#: Merge.rc:2116
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr ""
 
-#: Merge.rc:2122
+#: Merge.rc:2117
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr ""
 
-#: Merge.rc:2124
+#: Merge.rc:2119
 #, c-format
 msgid "Break at whitespace"
 msgstr ""
 
-#: Merge.rc:2125
+#: Merge.rc:2120
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr ""
 
-#: Merge.rc:2131
-#: Merge.rc:2133
+#: Merge.rc:2126
+#: Merge.rc:2128
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr ""
 
-#: Merge.rc:2132
-#: Merge.rc:2134
+#: Merge.rc:2127
+#: Merge.rc:2129
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr ""
 
-#: Merge.rc:2135
+#: Merge.rc:2130
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Excluir o objeto selecionado a esquerda"
 
-#: Merge.rc:2136
+#: Merge.rc:2131
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Excluir o objeto selecionado a direita"
 
-#: Merge.rc:2137
+#: Merge.rc:2132
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Excluir o(s) arquivo(s) selecionado(s) em ambos os lados"
 
-#: Merge.rc:2138
+#: Merge.rc:2133
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr ""
 
-#: Merge.rc:2139
+#: Merge.rc:2134
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr ""
 
-#: Merge.rc:2140
+#: Merge.rc:2135
 #, c-format
 msgid "Right to Left (%1)"
 msgstr ""
 
-#: Merge.rc:2141
+#: Merge.rc:2136
 #, c-format
 msgid "Left to Right (%1)"
 msgstr ""
 
-#: Merge.rc:2142
+#: Merge.rc:2137
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2143
+#: Merge.rc:2138
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2144
-#: Merge.rc:2160
+#: Merge.rc:2139
+#: Merge.rc:2155
 #, c-format
 msgid "Left to... (%1)"
 msgstr ""
 
-#: Merge.rc:2145
-#: Merge.rc:2161
+#: Merge.rc:2140
+#: Merge.rc:2156
 #, c-format
 msgid "Right to... (%1)"
 msgstr ""
 
-#: Merge.rc:2146
-#: Merge.rc:2162
+#: Merge.rc:2141
+#: Merge.rc:2157
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2147
-#: Merge.rc:2163
+#: Merge.rc:2142
+#: Merge.rc:2158
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2153
+#: Merge.rc:2148
 #, c-format
 msgid "Left (%1)"
 msgstr ""
 
-#: Merge.rc:2154
+#: Merge.rc:2149
 #, c-format
 msgid "Right (%1)"
 msgstr ""
 
-#: Merge.rc:2155
+#: Merge.rc:2150
 #, c-format
 msgid "Both (%1)"
 msgstr ""
 
-#: Merge.rc:2156
+#: Merge.rc:2151
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2157
+#: Merge.rc:2152
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2158
+#: Merge.rc:2153
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2159
+#: Merge.rc:2154
 #, c-format
 msgid "Select destination folder"
 msgstr ""
 
-#: Merge.rc:2164
+#: Merge.rc:2159
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr ""
 
-#: Merge.rc:2165
+#: Merge.rc:2160
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr ""
 
-#: Merge.rc:2166
+#: Merge.rc:2161
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2167
+#: Merge.rc:2162
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2173
+#: Merge.rc:2168
 #, c-format
-msgid "Are you sure you want to copy all differences to the left file?"
-msgstr "Voc\xEA deseja realmente copiar TODAS diferen\xE7as para o arquivo da esquerda?"
-
-#: Merge.rc:2174
-#, c-format
-msgid "Are you sure you want to copy all differences to the right file?"
-msgstr "Voc\xEA deseja realmente copiar TODAS diferen\xE7as para o arquivo da direita?"
-
-#: Merge.rc:2175
-#, c-format
 msgid ""
-"Are you sure you want to copy\n"
-"\n"
-"%1\n"
-"to\n"
-"%2 ?"
-msgstr ""
-"Voc\xEA tem certeza que deseja copiar\n"
-"\n"
-"%1\n"
-"para\n"
-"%2 ?"
-
-#: Merge.rc:2176
-#, c-format
-msgid "Are you sure you want to copy %1 of %2 selected item(s)?"
-msgstr ""
-
-#: Merge.rc:2177
-#, c-format
-msgid "Are you sure you want to delete %1 of %2 selected item(s)?"
-msgstr "Voc\xEA tem certeza que deseja excluir %1 de %2 do(s) objecto(s) selecionado(s)?"
-
-#: Merge.rc:2178
-#, c-format
-msgid ""
-"Delete directory\n"
-"\n"
-"%1 ?"
-msgstr ""
-"Excluir o diret\xF3rio\n"
-"\n"
-"%1 ?"
-
-#: Merge.rc:2179
-#, c-format
-msgid ""
 "Are you sure you want to delete\n"
 "\n"
 "%1 ?"
@@ -3984,17 +3893,17 @@
 "\n"
 "%1 ?"
 
-#: Merge.rc:2180
+#: Merge.rc:2169
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr ""
 
-#: Merge.rc:2181
+#: Merge.rc:2170
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr ""
 
-#: Merge.rc:2182
+#: Merge.rc:2171
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4006,505 +3915,505 @@
 "Please refresh the compare."
 msgstr ""
 
-#: Merge.rc:2188
+#: Merge.rc:2177
 #, c-format
 msgid "Open left file"
 msgstr "Abrir arquivo a esquerda"
 
-#: Merge.rc:2189
+#: Merge.rc:2178
 #, c-format
 msgid "Open the left file to external editor"
 msgstr ""
 
-#: Merge.rc:2190
+#: Merge.rc:2179
 #, c-format
 msgid "Open left file with ..."
 msgstr "Abrir arquivo a esquerda com..."
 
-#: Merge.rc:2191
+#: Merge.rc:2180
 #, c-format
 msgid "Open right file"
 msgstr "Abrir arquivo a direita"
 
-#: Merge.rc:2192
+#: Merge.rc:2181
 #, c-format
 msgid "Open the right file to external editor"
 msgstr ""
 
-#: Merge.rc:2193
+#: Merge.rc:2182
 #, c-format
 msgid "Open right file with..."
 msgstr "Abrir o arquivo a direita com..."
 
-#: Merge.rc:2194
+#: Merge.rc:2183
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr ""
 
-#: Merge.rc:2195
+#: Merge.rc:2184
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr ""
 
-#: Merge.rc:2196
+#: Merge.rc:2185
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr ""
 
-#: Merge.rc:2197
+#: Merge.rc:2186
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2198
+#: Merge.rc:2187
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2199
+#: Merge.rc:2188
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2205
+#: Merge.rc:2194
 #, c-format
 msgid "Unknown archive format"
 msgstr ""
 
-#: Merge.rc:2206
+#: Merge.rc:2195
 #, c-format
 msgid "Add items from left side to archive"
 msgstr ""
 
-#: Merge.rc:2207
+#: Merge.rc:2196
 #, c-format
 msgid "Add items from right side to archive"
 msgstr ""
 
-#: Merge.rc:2208
+#: Merge.rc:2197
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr ""
 
-#: Merge.rc:2209
+#: Merge.rc:2198
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr ""
 
-#: Merge.rc:2211
+#: Merge.rc:2200
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr ""
 
-#: Merge.rc:2213
+#: Merge.rc:2202
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr ""
 
-#: Merge.rc:2219
+#: Merge.rc:2208
 #, c-format
 msgid "Filename"
 msgstr "Nome de Arquivo"
 
-#: Merge.rc:2220
+#: Merge.rc:2209
 #, c-format
 msgid "Folder"
 msgstr ""
 
-#: Merge.rc:2221
+#: Merge.rc:2210
 #, c-format
 msgid "Comparison result"
 msgstr "Resultados da compara\xE7\xE3o"
 
-#: Merge.rc:2222
+#: Merge.rc:2211
 #, c-format
 msgid "Left Date"
 msgstr "Data da Esquerda"
 
-#: Merge.rc:2223
+#: Merge.rc:2212
 #, c-format
 msgid "Right Date"
 msgstr "Data da Direita"
 
-#: Merge.rc:2224
+#: Merge.rc:2213
 #, c-format
 msgid "Extension"
 msgstr "Extens\xE3o"
 
-#: Merge.rc:2225
+#: Merge.rc:2214
 #, c-format
 msgid "Left Size"
 msgstr ""
 
-#: Merge.rc:2226
+#: Merge.rc:2215
 #, c-format
 msgid "Right Size"
 msgstr ""
 
-#: Merge.rc:2227
+#: Merge.rc:2216
 #, c-format
 msgid "Right Size (Short)"
 msgstr ""
 
-#: Merge.rc:2228
+#: Merge.rc:2217
 #, c-format
 msgid "Left Size (Short)"
 msgstr ""
 
-#: Merge.rc:2234
+#: Merge.rc:2223
 #, c-format
 msgid "Left Creation Time"
 msgstr ""
 
-#: Merge.rc:2235
+#: Merge.rc:2224
 #, c-format
 msgid "Right Creation Time"
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2225
 #, c-format
 msgid "Newer File"
 msgstr ""
 
-#: Merge.rc:2237
+#: Merge.rc:2226
 #, c-format
 msgid "Left File Version"
 msgstr ""
 
-#: Merge.rc:2238
+#: Merge.rc:2227
 #, c-format
 msgid "Right File Version"
 msgstr ""
 
-#: Merge.rc:2239
+#: Merge.rc:2228
 #, c-format
 msgid "Short Result"
 msgstr ""
 
-#: Merge.rc:2240
+#: Merge.rc:2229
 #, c-format
 msgid "Left Attributes"
 msgstr ""
 
-#: Merge.rc:2241
+#: Merge.rc:2230
 #, c-format
 msgid "Right Attributes"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2231
 #, c-format
 msgid "Left EOL"
 msgstr ""
 
-#: Merge.rc:2243
+#: Merge.rc:2232
 #, c-format
 msgid "Right EOL"
 msgstr ""
 
-#: Merge.rc:2249
+#: Merge.rc:2238
 #, c-format
 msgid "Left Encoding"
 msgstr ""
 
-#: Merge.rc:2250
+#: Merge.rc:2239
 #, c-format
 msgid "Right Encoding"
 msgstr ""
 
-#: Merge.rc:2251
+#: Merge.rc:2240
 #, c-format
 msgid "Ignored Diff."
 msgstr ""
 
-#: Merge.rc:2252
+#: Merge.rc:2241
 #, c-format
 msgid "Differences"
 msgstr ""
 
-#: Merge.rc:2253
-#: Merge.rc:2732
+#: Merge.rc:2242
+#: Merge.rc:2721
 #, c-format
 msgid "Binary"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2248
 #, c-format
 msgid "Unable to compare files"
 msgstr "N\xE3o foi poss\xEDvel comparar os arquivos"
 
-#: Merge.rc:2260
+#: Merge.rc:2249
 #, c-format
 msgid "Item aborted"
 msgstr ""
 
-#: Merge.rc:2261
+#: Merge.rc:2250
 #, c-format
 msgid "File skipped"
 msgstr ""
 
-#: Merge.rc:2262
+#: Merge.rc:2251
 #, c-format
 msgid "Folder skipped"
 msgstr ""
 
-#: Merge.rc:2263
+#: Merge.rc:2252
 #, c-format
 msgid "Left only: %1"
 msgstr ""
 
-#: Merge.rc:2264
+#: Merge.rc:2253
 #, c-format
 msgid "Right only: %1"
 msgstr ""
 
-#: Merge.rc:2265
+#: Merge.rc:2254
 #, c-format
 msgid "Binary files are identical"
 msgstr "Os arquivos bin\xE1rios s\xE3o id\xEAnticos"
 
-#: Merge.rc:2267
+#: Merge.rc:2256
 #, c-format
 msgid "Binary files are different"
 msgstr "Os arquivos (bin\xE1rios) s\xE3o diferentes"
 
-#: Merge.rc:2268
+#: Merge.rc:2257
 #, c-format
 msgid "Files are different"
 msgstr "Os arquivos s\xE3o diferentes"
 
-#: Merge.rc:2269
+#: Merge.rc:2258
 #, c-format
 msgid "Left Only"
 msgstr ""
 
-#: Merge.rc:2270
+#: Merge.rc:2259
 #, c-format
 msgid "Right Only"
 msgstr ""
 
-#: Merge.rc:2272
+#: Merge.rc:2261
 #, c-format
 msgid "Error"
 msgstr ""
 
-#: Merge.rc:2278
+#: Merge.rc:2267
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr ""
 
-#: Merge.rc:2279
+#: Merge.rc:2268
 #, c-format
 msgid "1 item selected"
 msgstr ""
 
-#: Merge.rc:2280
+#: Merge.rc:2269
 #, c-format
 msgid "%1 items selected"
 msgstr ""
 
-#: Merge.rc:2286
+#: Merge.rc:2275
 #, c-format
 msgid "Filename or folder name."
 msgstr ""
 
-#: Merge.rc:2287
+#: Merge.rc:2276
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr ""
 
-#: Merge.rc:2288
+#: Merge.rc:2277
 #, c-format
 msgid "Comparison result, long form."
 msgstr ""
 
-#: Merge.rc:2289
+#: Merge.rc:2278
 #, c-format
 msgid "Left side modification date."
 msgstr ""
 
-#: Merge.rc:2290
+#: Merge.rc:2279
 #, c-format
 msgid "Right side modification date."
 msgstr ""
 
-#: Merge.rc:2291
+#: Merge.rc:2280
 #, c-format
 msgid "File's extension."
 msgstr ""
 
-#: Merge.rc:2292
+#: Merge.rc:2281
 #, c-format
 msgid "Left file size in bytes."
 msgstr ""
 
-#: Merge.rc:2293
+#: Merge.rc:2282
 #, c-format
 msgid "Right file size in bytes."
 msgstr ""
 
-#: Merge.rc:2294
+#: Merge.rc:2283
 #, c-format
 msgid "Left file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2295
+#: Merge.rc:2284
 #, c-format
 msgid "Right file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2290
 #, c-format
 msgid "Left side creation time."
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2291
 #, c-format
 msgid "Right side creation time."
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2292
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2293
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2305
+#: Merge.rc:2294
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2306
+#: Merge.rc:2295
 #, c-format
 msgid "Short comparison result."
 msgstr ""
 
-#: Merge.rc:2307
+#: Merge.rc:2296
 #, c-format
 msgid "Left side attributes."
 msgstr ""
 
-#: Merge.rc:2308
+#: Merge.rc:2297
 #, c-format
 msgid "Right side attributes."
 msgstr ""
 
-#: Merge.rc:2309
+#: Merge.rc:2298
 #, c-format
 msgid "Left side file EOL type"
 msgstr ""
 
-#: Merge.rc:2310
+#: Merge.rc:2299
 #, c-format
 msgid "Right side file EOL type"
 msgstr ""
 
-#: Merge.rc:2316
+#: Merge.rc:2305
 #, c-format
 msgid "Left side encoding."
 msgstr ""
 
-#: Merge.rc:2317
+#: Merge.rc:2306
 #, c-format
 msgid "Right side encoding."
 msgstr ""
 
-#: Merge.rc:2318
+#: Merge.rc:2307
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr ""
 
-#: Merge.rc:2319
+#: Merge.rc:2308
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr ""
 
-#: Merge.rc:2320
+#: Merge.rc:2309
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr ""
 
-#: Merge.rc:2326
+#: Merge.rc:2315
 #, c-format
 msgid "Compare %1 with %2"
 msgstr ""
 
-#: Merge.rc:2327
+#: Merge.rc:2316
 #, c-format
 msgid "Comma-separated list"
 msgstr ""
 
-#: Merge.rc:2328
+#: Merge.rc:2317
 #, c-format
 msgid "Tab-separated list"
 msgstr ""
 
-#: Merge.rc:2329
+#: Merge.rc:2318
 #, c-format
 msgid "Simple HTML"
 msgstr ""
 
-#: Merge.rc:2330
+#: Merge.rc:2319
 #, c-format
 msgid "Simple XML"
 msgstr ""
 
-#: Merge.rc:2332
+#: Merge.rc:2321
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr ""
 
-#: Merge.rc:2333
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Error creating the report:\n"
 "%1"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2323
 #, c-format
 msgid "The report has been created successfully."
 msgstr ""
 
-#: Merge.rc:2340
+#: Merge.rc:2329
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr ""
 
-#: Merge.rc:2341
+#: Merge.rc:2330
 #, c-format
 msgid "The selected files are identical."
 msgstr "Os arquivos selecionados s\xE3o id\xEAnticos."
 
-#: Merge.rc:2342
+#: Merge.rc:2331
 #, c-format
 msgid "The selected folder exists only in other side and therefore cannot be opened."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2332
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Ocorreu um erro durante a compara\xE7\xE3o dos arquivos."
 
-#: Merge.rc:2344
+#: Merge.rc:2333
 #, c-format
 msgid "Binary files cannot be visually compared."
 msgstr "Arquivos bin\xE1rios n\xE3o podem ser comparados visualmente."
 
-#: Merge.rc:2345
+#: Merge.rc:2334
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr ""
 
-#: Merge.rc:2346
+#: Merge.rc:2335
 #, c-format
 msgid "Directory files cannot be visually compared."
 msgstr "Os arquivos deste diret\xF3rio, n\xE3o podem ser comparados visualmente."
 
-#: Merge.rc:2347
+#: Merge.rc:2336
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -4514,7 +4423,7 @@
 "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
 msgstr ""
 
-#: Merge.rc:2348
+#: Merge.rc:2337
 #, c-format
 msgid ""
 "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n"
@@ -4522,22 +4431,22 @@
 " Do you want to change the options and preserve the different EOL ?"
 msgstr ""
 
-#: Merge.rc:2349
+#: Merge.rc:2338
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr ""
 
-#: Merge.rc:2350
+#: Merge.rc:2339
 #, c-format
 msgid "The selected folder is invalid."
 msgstr ""
 
-#: Merge.rc:2351
+#: Merge.rc:2340
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr ""
 
-#: Merge.rc:2357
+#: Merge.rc:2346
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -4545,132 +4454,132 @@
 "Would you like to treat both files as being in the default windows codepage (recommended)?"
 msgstr ""
 
-#: Merge.rc:2358
+#: Merge.rc:2347
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr ""
 
-#: Merge.rc:2359
+#: Merge.rc:2348
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr ""
 
-#: Merge.rc:2360
+#: Merge.rc:2349
 #, c-format
 msgid "Information lost due to encoding errors: right file"
 msgstr ""
 
-#: Merge.rc:2361
+#: Merge.rc:2350
 #, c-format
 msgid "Information lost due to encoding errors: left file"
 msgstr ""
 
-#: Merge.rc:2367
+#: Merge.rc:2356
 #, c-format
 msgid "No difference"
 msgstr ""
 
-#: Merge.rc:2368
+#: Merge.rc:2357
 #, c-format
 msgid "Line difference"
 msgstr ""
 
-#: Merge.rc:2374
+#: Merge.rc:2363
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Substituindo %1 texto(s)."
 
-#: Merge.rc:2375
+#: Merge.rc:2364
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "N\xE3o foi poss\xEDvel localizar \"%s\""
 
-#: Merge.rc:2381
+#: Merge.rc:2370
 #, c-format
 msgid "Copy Full Path"
 msgstr ""
 
-#: Merge.rc:2382
+#: Merge.rc:2371
 #, c-format
 msgid "Copy Filename"
 msgstr ""
 
-#: Merge.rc:2388
+#: Merge.rc:2377
 #, c-format
 msgid "Location Pane"
 msgstr ""
 
-#: Merge.rc:2389
+#: Merge.rc:2378
 #, c-format
 msgid "Diff Pane"
 msgstr ""
 
-#: Merge.rc:2395
+#: Merge.rc:2384
 #, c-format
 msgid "Patch file successfully written."
 msgstr ""
 
-#: Merge.rc:2396
+#: Merge.rc:2385
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr ""
 
-#: Merge.rc:2397
+#: Merge.rc:2386
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr ""
 
-#: Merge.rc:2398
+#: Merge.rc:2387
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: Merge.rc:2399
+#: Merge.rc:2388
 #, c-format
 msgid "[%1 files selected]"
 msgstr ""
 
-#: Merge.rc:2400
+#: Merge.rc:2389
 #, c-format
 msgid "Normal"
 msgstr ""
 
-#: Merge.rc:2401
+#: Merge.rc:2390
 #, c-format
 msgid "Context"
 msgstr ""
 
-#: Merge.rc:2402
+#: Merge.rc:2391
 #, c-format
 msgid "Unified"
 msgstr ""
 
-#: Merge.rc:2403
+#: Merge.rc:2392
 #, c-format
 msgid "Could not write to file %1."
 msgstr ""
 
-#: Merge.rc:2404
+#: Merge.rc:2393
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr ""
 
-#: Merge.rc:2405
+#: Merge.rc:2394
 #, c-format
 msgid "Specify an output file"
 msgstr ""
 
-#: Merge.rc:2406
+#: Merge.rc:2395
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr ""
 
-#: Merge.rc:2407
+#: Merge.rc:2396
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr ""
 
-#: Merge.rc:2408
+#: Merge.rc:2397
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -4678,17 +4587,17 @@
 "Creating a patch requires that there are no unsaved changes in files."
 msgstr ""
 
-#: Merge.rc:2409
+#: Merge.rc:2398
 #, c-format
 msgid "Folder does not exist."
 msgstr ""
 
-#: Merge.rc:2414
+#: Merge.rc:2403
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr ""
 
-#: Merge.rc:2415
+#: Merge.rc:2404
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -4696,51 +4605,51 @@
 "See manual for more info about archive support and how to enable it."
 msgstr ""
 
-#: Merge.rc:2416
+#: Merge.rc:2405
 #, c-format
 msgid ""
 "\n"
 "Note: 7-Zip integration is disabled in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2417
+#: Merge.rc:2406
 #, c-format
 msgid ""
 "\n"
 "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2418
+#: Merge.rc:2407
 #, c-format
 msgid "Select file for export"
 msgstr ""
 
-#: Merge.rc:2419
+#: Merge.rc:2408
 #, c-format
 msgid "Select file for import"
 msgstr ""
 
-#: Merge.rc:2420
+#: Merge.rc:2409
 #, c-format
 msgid "Options imported from the file."
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2410
 #, c-format
 msgid "Options exported to the file."
 msgstr ""
 
-#: Merge.rc:2422
+#: Merge.rc:2411
 #, c-format
 msgid "Failed to import options from the file."
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2412
 #, c-format
 msgid "Failed to write options to the file."
 msgstr ""
 
-#: Merge.rc:2424
+#: Merge.rc:2413
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -4748,1124 +4657,1124 @@
 "Do you want to continue?"
 msgstr ""
 
-#: Merge.rc:2430
+#: Merge.rc:2419
 #, c-format
 msgid "Regular expression error"
 msgstr ""
 
-#: Merge.rc:2431
+#: Merge.rc:2420
 #, c-format
 msgid "No match"
 msgstr ""
 
-#: Merge.rc:2432
+#: Merge.rc:2421
 #, c-format
 msgid "Invalid regular expression"
 msgstr ""
 
-#: Merge.rc:2433
+#: Merge.rc:2422
 #, c-format
 msgid "Invalid collation character"
 msgstr ""
 
-#: Merge.rc:2434
+#: Merge.rc:2423
 #, c-format
 msgid "Invalid character class name"
 msgstr ""
 
-#: Merge.rc:2435
+#: Merge.rc:2424
 #, c-format
 msgid "Trailing backslash"
 msgstr ""
 
-#: Merge.rc:2436
+#: Merge.rc:2425
 #, c-format
 msgid "Invalid back reference"
 msgstr ""
 
-#: Merge.rc:2437
+#: Merge.rc:2426
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr ""
 
-#: Merge.rc:2438
+#: Merge.rc:2427
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: Merge.rc:2439
+#: Merge.rc:2428
 #, c-format
 msgid "Unmatched \\{"
 msgstr ""
 
-#: Merge.rc:2440
+#: Merge.rc:2429
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr ""
 
-#: Merge.rc:2441
+#: Merge.rc:2430
 #, c-format
 msgid "Invalid range end"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2431
 #, c-format
 msgid "Out of memory"
 msgstr ""
 
-#: Merge.rc:2443
+#: Merge.rc:2432
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: Merge.rc:2444
+#: Merge.rc:2433
 #, c-format
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: Merge.rc:2445
+#: Merge.rc:2434
 #, c-format
 msgid "Regular expression too big"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2439
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2445
 #, c-format
 msgid "Afrikaans"
 msgstr ""
 
-#: Merge.rc:2457
+#: Merge.rc:2446
 #, c-format
 msgid "Albanian"
 msgstr "Alban\xEAs"
 
-#: Merge.rc:2458
+#: Merge.rc:2447
 #, c-format
 msgid "Arabic (Saudi Arabian)"
 msgstr "\xC1rabe (Saudi Arabian)"
 
-#: Merge.rc:2459
+#: Merge.rc:2448
 #, c-format
 msgid "Arabic (Iraq)"
 msgstr "\xC1rabe (Iraq)"
 
-#: Merge.rc:2460
+#: Merge.rc:2449
 #, c-format
 msgid "Arabic (Egyptian)"
 msgstr "\xC1rabe (Egyptian)"
 
-#: Merge.rc:2461
+#: Merge.rc:2450
 #, c-format
 msgid "Arabic (Libyan)"
 msgstr "\xC1rabe (Libyan)"
 
-#: Merge.rc:2462
+#: Merge.rc:2451
 #, c-format
 msgid "Arabic (Algerian)"
 msgstr "\xC1rabe (Algerian)"
 
-#: Merge.rc:2463
+#: Merge.rc:2452
 #, c-format
 msgid "Arabic (Moroccan)"
 msgstr "\xC1rabe (Moroccan)"
 
-#: Merge.rc:2464
+#: Merge.rc:2453
 #, c-format
 msgid "Arabic (Tunisian)"
 msgstr "\xC1rabe (Tunisian)"
 
-#: Merge.rc:2465
+#: Merge.rc:2454
 #, c-format
 msgid "Arabic (Oman)"
 msgstr "\xC1rabe (Oman)"
 
-#: Merge.rc:2466
+#: Merge.rc:2455
 #, c-format
 msgid "Arabic (Yemen)"
 msgstr "\xC1rabe (Yemen)"
 
-#: Merge.rc:2467
+#: Merge.rc:2456
 #, c-format
 msgid "Arabic (Syrian)"
 msgstr "\xC1rabe (Syrian)"
 
-#: Merge.rc:2468
+#: Merge.rc:2457
 #, c-format
 msgid "Arabic (Jordan)"
 msgstr "\xC1rabe (Jordan)"
 
-#: Merge.rc:2474
+#: Merge.rc:2463
 #, c-format
 msgid "Arabic (Lebanon)"
 msgstr "\xC1rabe (Lebanon)"
 
-#: Merge.rc:2475
+#: Merge.rc:2464
 #, c-format
 msgid "Arabic (Kuwait)"
 msgstr "\xC1rabe (Kuwait)"
 
-#: Merge.rc:2476
+#: Merge.rc:2465
 #, c-format
 msgid "Arabic (UAE)"
 msgstr "\xC1rabe (UAE)"
 
-#: Merge.rc:2477
+#: Merge.rc:2466
 #, c-format
 msgid "Arabic (Bahrain)"
 msgstr "\xC1rabe (Bahrain)"
 
-#: Merge.rc:2478
+#: Merge.rc:2467
 #, c-format
 msgid "Arabic (Qatar)"
 msgstr "\xC1rabe (Qatar)"
 
-#: Merge.rc:2479
+#: Merge.rc:2468
 #, c-format
 msgid "Armenian"
 msgstr "Arm\xE9nio"
 
-#: Merge.rc:2480
+#: Merge.rc:2469
 #, c-format
 msgid "Azeri (Latin)"
 msgstr ""
 
-#: Merge.rc:2481
+#: Merge.rc:2470
 #, c-format
 msgid "Azeri (Cyrillic)"
 msgstr ""
 
-#: Merge.rc:2482
+#: Merge.rc:2471
 #, c-format
 msgid "Basque"
 msgstr ""
 
-#: Merge.rc:2483
+#: Merge.rc:2472
 #, c-format
 msgid "Belarusian"
 msgstr ""
 
-#: Merge.rc:2484
+#: Merge.rc:2473
 #, c-format
 msgid "Bulgarian"
 msgstr "B\xFAlgaro"
 
-#: Merge.rc:2485
+#: Merge.rc:2474
 #, c-format
 msgid "Catalan"
 msgstr "Catal\xE3o"
 
-#: Merge.rc:2486
+#: Merge.rc:2475
 #, c-format
 msgid "Chinese (Traditional)"
 msgstr "Chin\xEAs (Traditional)"
 
-#: Merge.rc:2487
+#: Merge.rc:2476
 #, c-format
 msgid "Chinese (Simplified)"
 msgstr "Chin\xEAs (Simplified)"
 
-#: Merge.rc:2488
+#: Merge.rc:2477
 #, c-format
 msgid "Chinese (Hong Kong)"
 msgstr "Chin\xEAs (Hong Kong)"
 
-#: Merge.rc:2489
+#: Merge.rc:2478
 #, c-format
 msgid "Chinese (Singapore)"
 msgstr "Chin\xEAs (Singapore)"
 
-#: Merge.rc:2495
+#: Merge.rc:2484
 #, c-format
 msgid "Chinese (Macau SAR)"
 msgstr "Chin\xEAs (Macau SAR)"
 
-#: Merge.rc:2496
+#: Merge.rc:2485
 #, c-format
 msgid "Croatian"
 msgstr "Croata"
 
-#: Merge.rc:2497
+#: Merge.rc:2486
 #, c-format
 msgid "Czech"
 msgstr "Checo"
 
-#: Merge.rc:2498
+#: Merge.rc:2487
 #, c-format
 msgid "Dansk"
 msgstr "Dinamarqu\xEAs"
 
-#: Merge.rc:2499
+#: Merge.rc:2488
 #, c-format
 msgid "Dutch"
 msgstr "Holand\xEAs"
 
-#: Merge.rc:2500
+#: Merge.rc:2489
 #, c-format
 msgid "Dutch (Belgium)"
 msgstr "Holand\xEAs (Belgium)"
 
-#: Merge.rc:2501
+#: Merge.rc:2490
 #, c-format
 msgid "English (US)"
 msgstr "Ingl\xEAs (US)"
 
-#: Merge.rc:2502
+#: Merge.rc:2491
 #, c-format
 msgid "English (UK)"
 msgstr "Ingl\xEAs (UK)"
 
-#: Merge.rc:2503
+#: Merge.rc:2492
 #, c-format
 msgid "English (Australian)"
 msgstr "Ingl\xEAs (Australian)"
 
-#: Merge.rc:2504
+#: Merge.rc:2493
 #, c-format
 msgid "English (Canadian)"
 msgstr "Ingl\xEAs (Canadian)"
 
-#: Merge.rc:2505
+#: Merge.rc:2494
 #, c-format
 msgid "English (New Zealand)"
 msgstr "Ingl\xEAs (New Zealand)"
 
-#: Merge.rc:2506
+#: Merge.rc:2495
 #, c-format
 msgid "English (Irish)"
 msgstr "Ingl\xEAs (Irish)"
 
-#: Merge.rc:2507
+#: Merge.rc:2496
 #, c-format
 msgid "English (So. African)"
 msgstr "Ingl\xEAs (So. African)"
 
-#: Merge.rc:2508
+#: Merge.rc:2497
 #, c-format
 msgid "English (Jamaican)"
 msgstr "Ingl\xEAs (Jamaican)"
 
-#: Merge.rc:2509
+#: Merge.rc:2498
 #, c-format
 msgid "English (Caribbean)"
 msgstr "Ingl\xEAs (Caribbean)"
 
-#: Merge.rc:2510
+#: Merge.rc:2499
 #, c-format
 msgid "English (Belize)"
 msgstr "Ingl\xEAs (Belize)"
 
-#: Merge.rc:2516
+#: Merge.rc:2505
 #, c-format
 msgid "English (Trinidad)"
 msgstr "Ingl\xEAs (Trinidad)"
 
-#: Merge.rc:2517
+#: Merge.rc:2506
 #, c-format
 msgid "English (Zimbabwe)"
 msgstr "Ingl\xEAs (Zimbabwe)"
 
-#: Merge.rc:2518
+#: Merge.rc:2507
 #, c-format
 msgid "English (Philippines)"
 msgstr "Ingl\xEAs (Philippines)"
 
-#: Merge.rc:2519
+#: Merge.rc:2508
 #, c-format
 msgid "Eesti"
 msgstr "Est\xF3nio"
 
-#: Merge.rc:2520
+#: Merge.rc:2509
 #, c-format
 msgid "Faeroese"
 msgstr "Faroense"
 
-#: Merge.rc:2521
+#: Merge.rc:2510
 #, c-format
 msgid "Farsi"
 msgstr "Persa"
 
-#: Merge.rc:2522
+#: Merge.rc:2511
 #, c-format
 msgid "Suomi"
 msgstr "Finland\xEAs"
 
-#: Merge.rc:2523
+#: Merge.rc:2512
 #, c-format
 msgid "French"
 msgstr "Franc\xEAs"
 
-#: Merge.rc:2524
+#: Merge.rc:2513
 #, c-format
 msgid "French (Belgique)"
 msgstr "Franc\xEAs (Belgique)"
 
-#: Merge.rc:2525
+#: Merge.rc:2514
 #, c-format
 msgid "French (Canada)"
 msgstr "Franc\xEAs (Canada)"
 
-#: Merge.rc:2526
+#: Merge.rc:2515
 #, c-format
 msgid "French (Switzerland)"
 msgstr "Franc\xEAs (Switzerland)"
 
-#: Merge.rc:2527
+#: Merge.rc:2516
 #, c-format
 msgid "French (Luxembourg)"
 msgstr "Franc\xEAs (Luxembourg)"
 
-#: Merge.rc:2528
+#: Merge.rc:2517
 #, c-format
 msgid "French (Monaco)"
 msgstr "Franc\xEAs (Monaco)"
 
-#: Merge.rc:2529
+#: Merge.rc:2518
 #, c-format
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: Merge.rc:2530
+#: Merge.rc:2519
 #, c-format
 msgid "German (Germany)"
 msgstr "Alem\xE3o (Germany)"
 
-#: Merge.rc:2531
+#: Merge.rc:2520
 #, c-format
 msgid "German (Switzerland)"
 msgstr "Alem\xE3o (Switzerland)"
 
-#: Merge.rc:2537
+#: Merge.rc:2526
 #, c-format
 msgid "German (Austria)"
 msgstr "Alem\xE3o (Austria)"
 
-#: Merge.rc:2538
+#: Merge.rc:2527
 #, c-format
 msgid "German (Luxembourg)"
 msgstr "Alem\xE3o (Luxembourg)"
 
-#: Merge.rc:2539
+#: Merge.rc:2528
 #, c-format
 msgid "German (Liechtenstein)"
 msgstr "Alem\xE3o (Liechtenstein)"
 
-#: Merge.rc:2540
+#: Merge.rc:2529
 #, c-format
 msgid "Greek"
 msgstr "Grego (Moderno)"
 
-#: Merge.rc:2541
+#: Merge.rc:2530
 #, c-format
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: Merge.rc:2542
+#: Merge.rc:2531
 #, c-format
 msgid "Hindi"
 msgstr ""
 
-#: Merge.rc:2543
+#: Merge.rc:2532
 #, c-format
 msgid "Hungarian"
 msgstr "H\xFAngaro"
 
-#: Merge.rc:2544
+#: Merge.rc:2533
 #, c-format
 msgid "Icelandic"
 msgstr "Island\xEAs"
 
-#: Merge.rc:2545
+#: Merge.rc:2534
 #, c-format
 msgid "Indonesian"
 msgstr ""
 
-#: Merge.rc:2546
+#: Merge.rc:2535
 #, c-format
 msgid "Italian"
 msgstr "Italiano"
 
-#: Merge.rc:2547
+#: Merge.rc:2536
 #, c-format
 msgid "Italian (Swiss)"
 msgstr "Italiano (Swiss)"
 
-#: Merge.rc:2548
+#: Merge.rc:2537
 #, c-format
 msgid "Japanese"
 msgstr "Japon\xEAs"
 
-#: Merge.rc:2549
+#: Merge.rc:2538
 #, c-format
 msgid "Kashmiri (India)"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2539
 #, c-format
 msgid "Kazakh"
 msgstr ""
 
-#: Merge.rc:2551
+#: Merge.rc:2540
 #, c-format
 msgid "Korean"
 msgstr "Coreano"
 
-#: Merge.rc:2552
+#: Merge.rc:2541
 #, c-format
 msgid "Korean (Johab)"
 msgstr "Coreano (Johab)"
 
-#: Merge.rc:2558
+#: Merge.rc:2547
 #, c-format
 msgid "Latvian"
 msgstr "Let\xE3o"
 
-#: Merge.rc:2559
+#: Merge.rc:2548
 #, c-format
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: Merge.rc:2560
+#: Merge.rc:2549
 #, c-format
 msgid "Malay (Malaysian)"
 msgstr ""
 
-#: Merge.rc:2561
+#: Merge.rc:2550
 #, c-format
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: Merge.rc:2562
+#: Merge.rc:2551
 #, c-format
 msgid "Manipuri"
 msgstr ""
 
-#: Merge.rc:2563
+#: Merge.rc:2552
 #, c-format
 msgid "Norwegian (Bokml)"
 msgstr "Noruegu\xEAs (Bokmal)"
 
-#: Merge.rc:2564
+#: Merge.rc:2553
 #, c-format
 msgid "Norwegian (Nynorsk)"
 msgstr "Noruegu\xEAs (Nynorsk)"
 
-#: Merge.rc:2565
+#: Merge.rc:2554
 #, c-format
 msgid "Polski"
 msgstr "Polish"
 
-#: Merge.rc:2566
+#: Merge.rc:2555
 #, c-format
 msgid "Portugese"
 msgstr "Portugu\xEAs"
 
-#: Merge.rc:2567
+#: Merge.rc:2556
 #, c-format
 msgid "Portugese (Brazil)"
 msgstr "Portugu\xEAs (do Brasil)"
 
-#: Merge.rc:2568
+#: Merge.rc:2557
 #, c-format
 msgid "Romanian"
 msgstr "Romeno"
 
-#: Merge.rc:2569
+#: Merge.rc:2558
 #, c-format
 msgid "Russian"
 msgstr "Russo"
 
-#: Merge.rc:2570
+#: Merge.rc:2559
 #, c-format
 msgid "Sanskrit"
 msgstr ""
 
-#: Merge.rc:2571
+#: Merge.rc:2560
 #, c-format
 msgid "Serbian (Latin)"
 msgstr ""
 
-#: Merge.rc:2572
+#: Merge.rc:2561
 #, c-format
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: Merge.rc:2573
+#: Merge.rc:2562
 #, c-format
 msgid "Sindhi"
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2568
 #, c-format
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: Merge.rc:2580
+#: Merge.rc:2569
 #, c-format
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: Merge.rc:2581
+#: Merge.rc:2570
 #, c-format
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: Merge.rc:2582
+#: Merge.rc:2571
 #, c-format
 msgid "Spanish (Mexican)"
 msgstr "Espanhol (Mexican)"
 
-#: Merge.rc:2583
+#: Merge.rc:2572
 #, c-format
 msgid "Spanish (Modern)"
 msgstr "Espanhol (Modern)"
 
-#: Merge.rc:2584
+#: Merge.rc:2573
 #, c-format
 msgid "Spanish (Guatemala)"
 msgstr "Espanhol (Guatemala)"
 
-#: Merge.rc:2585
+#: Merge.rc:2574
 #, c-format
 msgid "Spanish (Costa Rica)"
 msgstr "Espanhol (Costa Rica)"
 
-#: Merge.rc:2586
+#: Merge.rc:2575
 #, c-format
 msgid "Spanish (Panama)"
 msgstr "Espanhol (Panama)"
 
-#: Merge.rc:2587
+#: Merge.rc:2576
 #, c-format
 msgid "Spanish (Dominican)"
 msgstr "Espanhol (Dominican)"
 
-#: Merge.rc:2588
+#: Merge.rc:2577
 #, c-format
 msgid "Spanish (Venezuela)"
 msgstr "Espanhol (da Venezuela)"
 
-#: Merge.rc:2589
+#: Merge.rc:2578
 #, c-format
 msgid "Spanish (Colombia)"
 msgstr "Espanhol (Colombia)"
 
-#: Merge.rc:2590
+#: Merge.rc:2579
 #, c-format
 msgid "Spanish (Peru)"
 msgstr "Espanhol (Peru)"
 
-#: Merge.rc:2591
+#: Merge.rc:2580
 #, c-format
 msgid "Spanish (Argentina)"
 msgstr "Espanhol (Argentina)"
 
-#: Merge.rc:2592
+#: Merge.rc:2581
 #, c-format
 msgid "Spanish (Ecuador)"
 msgstr "Espanhol (Ecuador)"
 
-#: Merge.rc:2593
+#: Merge.rc:2582
 #, c-format
 msgid "Spanish (Chile)"
 msgstr "Espanhol (Chile)"
 
-#: Merge.rc:2594
+#: Merge.rc:2583
 #, c-format
 msgid "Spanish (Uruguay)"
 msgstr "Espanhol (Uruguay)"
 
-#: Merge.rc:2600
+#: Merge.rc:2589
 #, c-format
 msgid "Spanish (Paraguay)"
 msgstr "Espanhol (Paraguay)"
 
-#: Merge.rc:2601
+#: Merge.rc:2590
 #, c-format
 msgid "Spanish (Bolivia)"
 msgstr "Espanhol (Bolivia)"
 
-#: Merge.rc:2602
+#: Merge.rc:2591
 #, c-format
 msgid "Spanish (El Salvador)"
 msgstr "Espanhol (El Salvador)"
 
-#: Merge.rc:2603
+#: Merge.rc:2592
 #, c-format
 msgid "Spanish (Honduras)"
 msgstr "Espanhol (Honduras)"
 
-#: Merge.rc:2604
+#: Merge.rc:2593
 #, c-format
 msgid "Spanish (Nicaragua)"
 msgstr "Espanhol (Nicaragua)"
 
-#: Merge.rc:2605
+#: Merge.rc:2594
 #, c-format
 msgid "Spanish (Puerto Rico)"
 msgstr "Espanhol (Puerto Rico)"
 
-#: Merge.rc:2606
+#: Merge.rc:2595
 #, c-format
 msgid "Swahili (Kenya)"
 msgstr ""
 
-#: Merge.rc:2607
+#: Merge.rc:2596
 #, c-format
 msgid "Swedish"
 msgstr "Sueco"
 
-#: Merge.rc:2608
+#: Merge.rc:2597
 #, c-format
 msgid "Swedish (Finland)"
 msgstr "Sueco (Finland)"
 
-#: Merge.rc:2609
+#: Merge.rc:2598
 #, c-format
 msgid "Tamil"
 msgstr ""
 
-#: Merge.rc:2610
+#: Merge.rc:2599
 #, c-format
 msgid "Tatar (Tatarstan)"
 msgstr ""
 
-#: Merge.rc:2611
+#: Merge.rc:2600
 #, c-format
 msgid "Thai"
 msgstr "Tailand\xEAs"
 
-#: Merge.rc:2612
+#: Merge.rc:2601
 #, c-format
 msgid "Turkish"
 msgstr "Turco"
 
-#: Merge.rc:2613
+#: Merge.rc:2602
 #, c-format
 msgid "Ukranian"
 msgstr "Ucraniano"
 
-#: Merge.rc:2614
+#: Merge.rc:2603
 #, c-format
 msgid "Urdu (Pakistan)"
 msgstr ""
 
-#: Merge.rc:2615
+#: Merge.rc:2604
 #, c-format
 msgid "Urdu (India)"
 msgstr ""
 
-#: Merge.rc:2621
+#: Merge.rc:2610
 #, c-format
 msgid "Uzbek (Latin)"
 msgstr ""
 
-#: Merge.rc:2622
+#: Merge.rc:2611
 #, c-format
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
-#: Merge.rc:2623
+#: Merge.rc:2612
 #, c-format
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: Merge.rc:2629
+#: Merge.rc:2618
 #, c-format
 msgid "Western European"
 msgstr ""
 
-#: Merge.rc:2630
+#: Merge.rc:2619
 #, c-format
 msgid "Eastern European"
 msgstr ""
 
-#: Merge.rc:2631
+#: Merge.rc:2620
 #, c-format
 msgid "East Asian"
 msgstr ""
 
-#: Merge.rc:2632
+#: Merge.rc:2621
 #, c-format
 msgid "SE & SW Asian"
 msgstr ""
 
-#: Merge.rc:2633
+#: Merge.rc:2622
 #, c-format
 msgid "Middle Eastern"
 msgstr ""
 
-#: Merge.rc:2634
-#: Merge.rc:2644
+#: Merge.rc:2623
+#: Merge.rc:2633
 #, c-format
 msgid "Not applicable"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2629
 #, c-format
 msgid "MS-Windows"
 msgstr ""
 
-#: Merge.rc:2641
+#: Merge.rc:2630
 #, c-format
 msgid "MS-DOS"
 msgstr ""
 
-#: Merge.rc:2642
+#: Merge.rc:2631
 #, c-format
 msgid "Macintosh"
 msgstr ""
...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge: [4955] trunk/Tools/Scripts

From: <ge...@us...> - 2008-01-24 21:45:45

Revision: 4955
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4955&view=rev
Author:   gerundt
Date:     2008-01-24 13:45:40 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
RFE: [ 1875248 ] Script to check Menu resources

Modified Paths:
--------------
    trunk/Tools/Scripts/ReadMe.txt

Added Paths:
-----------
    trunk/Tools/Scripts/CheckMenuResources.vbs

Added: trunk/Tools/Scripts/CheckMenuResources.vbs
===================================================================
--- trunk/Tools/Scripts/CheckMenuResources.vbs	                        (rev 0)
+++ trunk/Tools/Scripts/CheckMenuResources.vbs	2008-01-24 21:45:40 UTC (rev 4955)
@@ -0,0 +1,214 @@
+Option Explicit
+''
+' This script checks the menu resources.
+'
+' Copyright (C) 2008 by Tim Gerundt
+' Released under the "GNU General Public License"
+'
+' ID line follows -- this is updated by SVN
+' $Id$
+
+Const ForReading = 1
+
+Const NO_BLOCK = 0
+Const MENU_BLOCK = 1
+Const DIALOGEX_BLOCK = 2
+Const STRINGTABLE_BLOCK = 3
+Const VERSIONINFO_BLOCK = 4
+Const ACCELERATORS_BLOCK = 5
+
+Dim oFSO, bRunFromCmd
+
+Set oFSO = CreateObject("Scripting.FileSystemObject")
+
+bRunFromCmd = False
+If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
+  bRunFromCmd = True
+End If
+
+Call Main
+
+''
+' ...
+Sub Main
+  Dim oMenuItems, oMenuItem, oIds, sKey, oTxtFile
+  Dim StartTime, EndTime, Seconds
+  
+  StartTime = Time
+  
+  InfoBox "Checking menu resources....", 3
+  
+  Set oMenuItems = GetMenuItemsFromRcFile("..\..\Src\Merge.rc")
+  Set oIds = GetIdsFromRcFile("..\..\Src\Merge.rc")
+  
+  Set oTxtFile = oFSO.CreateTextFile("MenuResources.txt", True)
+  
+  oTxtFile.WriteLine "----------------------------------------"
+  oTxtFile.WriteLine "NO MNEMONIC CHAR"
+  oTxtFile.WriteLine "----------------------------------------"
+  For Each sKey In oMenuItems.Keys 'For all menu items...
+    Set oMenuItem = oMenuItems(sKey)
+    If (InStr(oMenuItem.Str, "&") = 0) Then 'If WITHOUT mnemonic...
+      oTxtFile.WriteLine oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")"
+    End If
+  Next
+  
+  oTxtFile.WriteLine ""
+  oTxtFile.WriteLine "----------------------------------------"
+  oTxtFile.WriteLine "NO DESCRIPTION TEXT"
+  oTxtFile.WriteLine "----------------------------------------"
+  For Each sKey In oMenuItems.Keys 'For all menu items...
+    Set oMenuItem = oMenuItems(sKey)
+    If (oMenuItem.Id <> "") Then 'If NOT empty...
+      If (oIds.Exists(oMenuItem.Id) = False) Then 'If WITHOUT description...
+        oTxtFile.WriteLine oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")"
+      End If
+    End If
+  Next
+  
+  oTxtFile.Close
+  
+  EndTime = Time
+  Seconds = DateDiff("s", StartTime, EndTime)
+  
+  InfoBox "File ""MenuResources.txt"" created, after " & Seconds & " second(s).", 10
+End Sub
+
+''
+' ...
+Class CMenuItem
+  Dim Menu, Str, Id
+End Class
+
+''
+' ...
+Function GetMenuItemsFromRcFile(ByVal sRcFilePath)
+  Dim oMenuItems, oMenuItem, oRcFile, sLine, iCount
+  Dim iBlockType, sMenu, sString, sId, oMatch
+  
+  Set oMenuItems = CreateObject("Scripting.Dictionary")
+  
+  If (oFSO.FileExists(sRcFilePath) = True) Then 'If the RC file exists...
+    iCount = 0
+    iBlockType = NO_BLOCK
+    sMenu = ""
+    Set oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading)
+    Do Until oRcFile.AtEndOfStream = True 'For all lines...
+      sLine = Trim(oRcFile.ReadLine)
+      
+      sString = ""
+      sId = ""
+      
+      If (FoundRegExpMatch(sLine, "(IDR_\w+) MENU", oMatch) = True) Then 'MENU...
+        iBlockType = MENU_BLOCK
+        sMenu = oMatch.SubMatches(0)
+      ElseIf (InStr(sLine, " DIALOGEX") > 0) Then 'DIALOGEX...
+        iBlockType = DIALOGEX_BLOCK
+      ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
+        iBlockType = STRINGTABLE_BLOCK
+      ElseIf (InStr(sLine, " VERSIONINFO") > 0) Then 'VERSIONINFO...
+        iBlockType = VERSIONINFO_BLOCK
+      ElseIf (InStr(sLine, " ACCELERATORS") > 0) Then 'ACCELERATORS...
+        iBlockType = ACCELERATORS_BLOCK
+      ElseIf (sLine = "BEGIN") Then 'BEGIN...
+        'IGNORE FOR SPEEDUP!
+      ElseIf (sLine = "END") Then 'END...
+        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
+          iBlockType = NO_BLOCK
+        End If
+      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
+        sLine = ""
+        'IGNORE FOR SPEEDUP!
+      ElseIf (sLine <> "") Then 'If NOT empty line...
+        If (iBlockType = MENU_BLOCK) Then
+          If (InStr(sLine, """") > 0) Then 'If quote found (for speedup)...
+            If (FoundRegExpMatch(sLine, """(.*)""", oMatch) = True) And (InStr(sLine, "_POPUP_") = 0) Then 'If "string"...
+              sString = oMatch.SubMatches(0)
+              If (sString <> "") Then 'If NOT empty...
+                If (FoundRegExpMatch(sLine, "(ID_\w+)", oMatch) = True) Then 'If ID...
+                  sId = oMatch.SubMatches(0)
+                End If
+                iCount = iCount + 1
+              End If
+            End If
+          End If
+        End If
+      End If
+      
+      If (sString <> "") Then
+        Set oMenuItem = New CMenuItem
+        oMenuItem.Menu = sMenu
+        oMenuItem.Str = sString
+        oMenuItem.Id = sId
+        oMenuItems.Add iCount, oMenuItem
+      End If
+    Loop
+    oRcFile.Close
+  End If
+  Set GetMenuItemsFromRcFile = oMenuItems
+End Function
+
+''
+' ...
+Function GetIdsFromRcFile(ByVal sRcPath)
+  Dim oIds, oTextFile, sLine
+  Dim reId, oMatch, sId, sString
+  
+  Set oIds = CreateObject("Scripting.Dictionary")
+  
+  Set reId = New RegExp
+  reId.Pattern = "(ID_\w+)\s+""(.*)"""
+  reId.IgnoreCase = False
+  
+  If (oFSO.FileExists(sRcPath) = True) Then 'If the RC file exists...
+    Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
+    Do Until oTextFile.AtEndOfStream = True 'For all lines...
+      sLine = Trim(oTextFile.ReadLine)
+      
+      sId = ""
+      sString = ""
+      If reId.Test(sLine) Then 'If ID...
+        Set oMatch = reId.Execute(sLine)(0)
+        sId = oMatch.SubMatches(0)
+        sString = oMatch.SubMatches(1)
+        
+        If (oIds.Exists(sId) = False) Then 'If the key is NOT already used...
+          oIds.Add sId, sString
+        End If
+      End If
+    Loop
+    oTextFile.Close
+  End If
+  Set GetIdsFromRcFile = oIds
+End Function
+
+''
+' ...
+Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
+  Dim oRegExp, oMatches
+  
+  Set oRegExp = New RegExp
+  oRegExp.Pattern = sPattern
+  oRegExp.IgnoreCase = True
+  
+  oMatchReturn = Null
+  FoundRegExpMatch = False
+  If (oRegExp.Test(sString) = True) Then
+    Set oMatches = oRegExp.Execute(sString)
+    Set oMatchReturn = oMatches(0)
+    FoundRegExpMatch = True
+  End If
+End Function
+
+''
+' ...
+Function InfoBox(ByVal sText, ByVal iSecondsToWait)
+  Dim oShell
+  
+  If (bRunFromCmd = False) Then 'If run from command line...
+    Set oShell = Wscript.CreateObject("WScript.Shell")
+    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
+  Else 'If NOT run from command line...
+    Wscript.Echo sText
+  End If
+End Function


Property changes on: trunk/Tools/Scripts/CheckMenuResources.vbs
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/Tools/Scripts/ReadMe.txt
===================================================================
--- trunk/Tools/Scripts/ReadMe.txt	2008-01-24 21:14:26 UTC (rev 4954)
+++ trunk/Tools/Scripts/ReadMe.txt	2008-01-24 21:45:40 UTC (rev 4955)
@@ -21,6 +21,11 @@
    -r:n, --revisions:n output log for last n revisions (default is 100)
 
 
+CheckMenuResources.vbs
+----------------------
+Script that checking the menu resources for missing mnemonic chars and description texts.
+
+
 CheckUnusedResources.vbs
 ------------------------
 Script for creating a list of (hopefully) unused resource IDs.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4954] trunk/Src

From: <ki...@us...> - 2008-01-24 21:14:38

Revision: 4954
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4954&view=rev
Author:   kimmov
Date:     2008-01-24 13:14:26 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
PATCH: [ 1879032 ] Remove copy-paste encoding detection code

Modified Paths:
--------------
    trunk/Src/Common/UniFile.cpp
    trunk/Src/Common/unicoder.cpp
    trunk/Src/Common/unicoder.h
    trunk/Src/DiffFileData.cpp

Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp	2008-01-23 22:36:03 UTC (rev 4953)
+++ trunk/Src/Common/UniFile.cpp	2008-01-24 21:14:26 UTC (rev 4954)
@@ -7,7 +7,7 @@
  *
  *  @brief Implementation of Unicode enabled file classes (Memory-mapped reader class, and Stdio replacement class)
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 /* The MIT License
@@ -273,34 +273,28 @@
  */
 bool UniMemFile::ReadBom()
 {
-	if (!IsOpen()) return false;
+	if (!IsOpen())
+		return false;
 
 	unsigned char * lpByte = m_base;
 	m_current = m_data = m_base;
 	m_charsize = 1;
-	if (m_filesize >= 2)
+	
+	m_unicoding = ucr::DetermineEncoding(lpByte, m_filesize);
+	switch (m_unicoding)
 	{
-		if (lpByte[0] == 0xFF && lpByte[1] == 0xFE)
-		{
-			m_unicoding = ucr::UCS2LE;
+		case ucr::UCS2LE:
+		case ucr::UCS2BE:
 			m_charsize = 2;
-			m_data = lpByte+2;
-		}
-		else if (lpByte[0] == 0xFE && lpByte[1] == 0xFF)
-		{
-			m_unicoding = ucr::UCS2BE;
-			m_charsize = 2;
-			m_data = lpByte+2;
-		}
+			m_data = lpByte + 2;
+			break;
+		case ucr::UTF8:
+			m_data = lpByte + 3;
+			break;
+		default:
+			break;
 	}
-	if (m_filesize >=3)
-	{
-		if (lpByte[0] == 0xEF && lpByte[1] == 0xBB && lpByte[2] == 0xBF)
-		{
-			m_unicoding = ucr::UTF8;
-			m_data = lpByte+3;
-		}
-	}
+
 	m_readbom = true;
 	m_current = m_data;
 	return (m_data != m_base);
@@ -748,7 +742,8 @@
  */
 bool UniStdioFile::ReadBom()
 {
-	if (!IsOpen()) return false;
+	if (!IsOpen())
+		return false;
 
 	fseek(m_fp, 0, SEEK_SET);
 
@@ -756,26 +751,24 @@
 	unsigned char buff[4];
 	int bytes = fread(buff, 1, 3, m_fp);
 	unsigned char * lpByte = (unsigned char *)buff;
-
 	m_data = 0;
 	m_charsize = 1;
-	if (bytes >= 2 && lpByte[0] == 0xFF && lpByte[1] == 0xFE)
+
+	m_unicoding = ucr::DetermineEncoding(lpByte, bytes);
+	switch (m_unicoding)
 	{
-		m_unicoding = ucr::UCS2LE;
-		m_charsize = 2;
-		m_data = 2;
+		case ucr::UCS2LE:
+		case ucr::UCS2BE:
+			m_charsize = 2;
+			m_data = 2;
+			break;
+		case ucr::UTF8:
+			m_data = 3;
+			break;
+		default:
+			break;
 	}
-	else if (bytes >= 2 && lpByte[0] == 0xFE && lpByte[1] == 0xFF)
-	{
-		m_unicoding = ucr::UCS2BE;
-		m_charsize = 2;
-		m_data = 2;
-	}
-	else if (bytes >= 3 && lpByte[0] == 0xEF && lpByte[1] == 0xBB && lpByte[2] == 0xBF)
-	{
-		m_unicoding = ucr::UTF8;
-		m_data = 3;
-	}
+
 	fseek(m_fp, (long)m_data, SEEK_SET);
 	m_readbom = true;
 	return (m_data != 0);

Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp	2008-01-23 22:36:03 UTC (rev 4953)
+++ trunk/Src/Common/unicoder.cpp	2008-01-24 21:14:26 UTC (rev 4954)
@@ -6,7 +6,7 @@
  *
  *  @brief  Implementation of utility unicode conversion routines
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 /* The MIT License
@@ -697,6 +697,36 @@
 	}
 }
 
+/**
+ * @brief Determine encoding from byte buffer.
+ * @param [in] pBuffer Pointer to the begin of the buffer.
+ * @param [in] size Size of the buffer.
+ * @return One of UNICODESET values as encoding.
+ */
+UNICODESET DetermineEncoding(LPBYTE pBuffer, int size)
+{
+	UNICODESET unicoding = ucr::NONE;
+	if (size >= 2)
+	{
+		if (pBuffer[0] == 0xFF && pBuffer[1] == 0xFE)
+		{
+			unicoding = ucr::UCS2LE;
+		}
+		else if (pBuffer[0] == 0xFE && pBuffer[1] == 0xFF)
+		{
+			unicoding = ucr::UCS2BE;
+		}
+	}
+	if (size >= 3)
+	{
+		if (pBuffer[0] == 0xEF && pBuffer[1] == 0xBB && pBuffer[2] == 0xBF)
+		{
+			unicoding = ucr::UTF8;
+		}
+	}
+	return unicoding;
+}
+
 } // namespace ucr
 
 /**

Modified: trunk/Src/Common/unicoder.h
===================================================================
--- trunk/Src/Common/unicoder.h	2008-01-23 22:36:03 UTC (rev 4953)
+++ trunk/Src/Common/unicoder.h	2008-01-24 21:14:26 UTC (rev 4954)
@@ -6,7 +6,7 @@
  *
  *  @brief  Declaration of utility unicode conversion routines
  */ 
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef unicoder_h_included
@@ -24,7 +24,15 @@
 	void resize(unsigned int needed);
 };
 
-typedef enum { NONE=0, UCS2LE, UCS2BE, UTF8 } UNICODESET;
+/** @brief Known Unicode encodings. */
+typedef enum
+{
+	NONE = 0,  /**< No unicode. */
+	UCS2LE,    /**< UCS-2 little endian. */
+	UCS2BE,    /**< UCS-2 big endian. */
+	UTF8,      /**< UTF-8. */
+} UNICODESET;
+
 CString GetUnicodesetName(UNICODESET codeset);
 
 int Ucs4_to_Utf8(UINT unich, unsigned char * utf8);
@@ -52,6 +60,7 @@
 CString CrossConvertToStringA(LPCSTR src, UINT srclen, int cpin, int cpout, bool * lossy);
 #endif
 
+UNICODESET DetermineEncoding(LPBYTE pBuffer, int size);
 } // namespace ucr
 
 bool EqualCodepages(int cp1, int cp2);

Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp	2008-01-23 22:36:03 UTC (rev 4953)
+++ trunk/Src/DiffFileData.cpp	2008-01-24 21:14:26 UTC (rev 4954)
@@ -5,7 +5,7 @@
  *
  * @date  Created: 2003-08-22
  */
-// RCS ID line follows -- this is updated by CVS
+// line follows -- this is updated by SVN
 // $Id$
 
 #include "stdafx.h"
@@ -176,33 +176,22 @@
 	if (fd == -1) 
 		return;
 	long tmp = _lseek(fd, 0, SEEK_SET);
-	switch (_read(fd, buffer, 3))
+
+	int bytes = _read(fd, buffer, 3);
+	unicoding = ucr::DetermineEncoding(buffer, bytes);
+	switch (unicoding)
 	{
-		case 3:
-			if (buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF)
-			{
-				size = 3;
-				unicoding = ucr::UTF8;
-				break;
-			}
-			// fall through & try the 2-byte BOMs
-		case 2:
-			if (buffer[0] == 0xFF && buffer[1] == 0xFE)
-			{
-				size = 2;
-				unicoding = ucr::UCS2LE;
-				break;
-			}
-			if (buffer[0] == 0xFE && buffer[1] == 0xFF)
-			{
-				size = 2;
-				unicoding = ucr::UCS2BE;
-				break;
-			}
+		case ucr::UCS2LE:
+		case ucr::UCS2BE:
+			size = 2;
+			break;
+		case ucr::UTF8:
+			size = 3;
+			break;
 		default:
-			size = 0;
-			unicoding = ucr::NONE;
+			break;
 	}
+
 	_lseek(fd, tmp, SEEK_SET);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4953] trunk/Docs/Users/ChangeLog.txt

From: <ge...@us...> - 2008-01-23 22:36:07

Revision: 4953
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4953&view=rev
Author:   gerundt
Date:     2008-01-23 14:36:03 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
Changelog: Add Croatian updates for WinMerge 2.7.7.4

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-23 22:28:25 UTC (rev 4952)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-23 22:36:03 UTC (rev 4953)
@@ -2,6 +2,10 @@
 Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
 to Subversion revision numbers (rXXXXX).
 
+WinMerge 2.7.7.4
+  Translation updates:
+  - Croatian (r4952)
+
 WinMerge 2.7.7.3 - 2008-01-23 (r4951)
   Resolve conflict files (cvs, svn...) (#1875129)
   Save line filter when edit box loses focus (#1875853)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4952] trunk/Src/Languages/Croatian.po

From: <ge...@us...> - 2008-01-23 22:28:30

Revision: 4952
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4952&view=rev
Author:   gerundt
Date:     2008-01-23 14:28:25 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
Small updates for Croatian translation by Hasan Osmanag?\195?\166

Modified Paths:
--------------
    trunk/Src/Languages/Croatian.po

Modified: trunk/Src/Languages/Croatian.po
===================================================================
--- trunk/Src/Languages/Croatian.po	2008-01-23 16:52:27 UTC (rev 4951)
+++ trunk/Src/Languages/Croatian.po	2008-01-23 22:28:25 UTC (rev 4952)
@@ -12,7 +12,7 @@
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-11-19 11:07+0100\n"
+"PO-Revision-Date: 2008-01-23 11:01+0100\n"
 "Last-Translator: Hasan Osmanag\xE6 <hasan.osmanagic at public.carnet.hr>\n"
 "Language-Team: winmerge-translate <win...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@
 #: Merge.rc:116
 #, c-format
 msgid "Open Project...\tCtrl+J"
-msgstr "Otvori usporedbu...\tCtrl+J"
+msgstr "&Otvori usporedbu...\tCtrl+J"
 
 #: Merge.rc:117
 #: Merge.rc:197
@@ -163,7 +163,7 @@
 #: Merge.rc:345
 #, c-format
 msgid "E&xit"
-msgstr "&Izlaz"
+msgstr "I&zlaz"
 
 #: Merge.rc:123
 #: Merge.rc:206
@@ -275,7 +275,7 @@
 #: Merge.rc:442
 #, c-format
 msgid "&Plugins"
-msgstr "&Dodaci"
+msgstr "Doda&ci"
 
 #: Merge.rc:150
 #: Merge.rc:266
@@ -852,12 +852,12 @@
 #: Merge.rc:493
 #, c-format
 msgid "Co&mpare Special"
-msgstr ""
+msgstr "Posebna usporedba"
 
 #: Merge.rc:495
 #, c-format
 msgid "&XML"
-msgstr ""
+msgstr "&XML"
 
 #: Merge.rc:500
 #, c-format
@@ -3555,7 +3555,7 @@
 #: Merge.rc:2042
 #, c-format
 msgid "RO"
-msgstr "RO"
+msgstr "S\xC8"
 
 #: Merge.rc:2048
 #, c-format
@@ -4735,7 +4735,7 @@
 #: Merge.rc:2395
 #, c-format
 msgid "Patch file successfully written."
-msgstr "Datoteka razlika je pohranjena"
+msgstr ""
 
 #: Merge.rc:2396
 #, c-format


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4951] trunk/Docs/Users/ChangeLog.txt

From: <ki...@us...> - 2008-01-23 16:52:29

Revision: 4951
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4951&view=rev
Author:   kimmov
Date:     2008-01-23 08:52:27 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
WinMerge experimental release 2.7.7.3 (SVN revision 4951)

Revision Links:
--------------
    http://winmerge.svn.sourceforge.net/winmerge/?rev=4951&view=rev

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-23 16:18:55 UTC (rev 4950)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-23 16:52:27 UTC (rev 4951)
@@ -2,7 +2,7 @@
 Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
 to Subversion revision numbers (rXXXXX).
 
-WinMerge 2.7.7.3
+WinMerge 2.7.7.3 - 2008-01-23 (r4951)
   Resolve conflict files (cvs, svn...) (#1875129)
   Save line filter when edit box loses focus (#1875853)
   Add link to translations website at help menu (#1699883)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4950] trunk/Src/DiffItem.h

From: <ki...@us...> - 2008-01-23 16:19:02

Revision: 4950
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4950&view=rev
Author:   kimmov
Date:     2008-01-23 08:18:55 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
PATCH: [ 1450646 ] Add some doxygen comments to diff item stuff
 Applied only the DiffItem.h changes that still were valid.

Modified Paths:
--------------
    trunk/Src/DiffItem.h

Modified: trunk/Src/DiffItem.h
===================================================================
--- trunk/Src/DiffItem.h	2008-01-23 15:13:15 UTC (rev 4949)
+++ trunk/Src/DiffItem.h	2008-01-23 16:18:55 UTC (rev 4950)
@@ -67,12 +67,18 @@
 	DIFFCODE(int diffcode = 0) : diffcode(diffcode) { }
 
 protected:
+	/// Worker function, to check one area (mask) of code for a particular value (result)
 	static bool Check(int code, int mask, int result) { return ((code & mask) == result); }
+	/// Convenience function to check the part of the code for comparison results
 	static bool CheckCompare(int code, int result) { return Check(code, DIFFCODE::COMPAREFLAGS, result); }
+	/// Convenience function to check the part of the code for filter status
 	static bool CheckFilter(int code, int result) { return Check(code, DIFFCODE::FILTERFLAGS, result); }
+	/// Convenience function to check the part of the code for side status (eg, left-only)
 	static bool CheckSide(int code, int result) { return Check(code, DIFFCODE::SIDEFLAGS, result); }
 
+	/// Worker function to set the area indicated by mask to specified result
 	void Set(int mask, int result) { diffcode &= (~mask); diffcode |= result; }
+	/// Convenience function to set the side status, eg, SetSide(DIFFCODE::LEFT)
 	void SetSide(int result) { Set(DIFFCODE::SIDEFLAGS, result); }
 public:
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4949] trunk/Docs/Users

From: <ki...@us...> - 2008-01-23 15:13:17

Revision: 4949
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4949&view=rev
Author:   kimmov
Date:     2008-01-23 07:13:15 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
PATCH: [ 1877735 ] Manual: Document third path in command line

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/Command_line.xml

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-22 23:13:10 UTC (rev 4948)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-23 15:13:15 UTC (rev 4949)
@@ -7,6 +7,7 @@
   Save line filter when edit box loses focus (#1875853)
   Add link to translations website at help menu (#1699883)
   Manual: Add instructions for conflict file resolving (#1876770)
+  Manual: Document third path given to command line (#1877735)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)
 

Modified: trunk/Docs/Users/Manual/Command_line.xml
===================================================================
--- trunk/Docs/Users/Manual/Command_line.xml	2008-01-22 23:13:10 UTC (rev 4948)
+++ trunk/Docs/Users/Manual/Command_line.xml	2008-01-23 15:13:15 UTC (rev 4949)
@@ -187,4 +187,15 @@
   <replaceable>rightpath</replaceable>) point to folders or files. It is not
   possible to compare folder to file (except in case described in above note).
   If WinMerge cannot find any of given paths, it opens Open-dialog.</para>
-</sect1>
+
+  <para>Third path given in command line is rarely needed when WinMerge is
+  started from command line. It is meant to be used with many version control
+  tools which use third path as a "<emphasis>result</emphasis>" file. WinMerge
+  always shows two files in file compare, the third path is a path where any
+  of these files gets saved into, leaving other two paths intact.</para>
+
+  <para>Usually these tools use terms like "<emphasis>theirs</emphasis>",
+  "<emphasis>mine</emphasis>" and "<emphasis>merged</emphasis> "/ "
+  <emphasis>resolved</emphasis>" about these three files. And those paths
+  should be given in that order for WinMerge.</para>
+</sect1>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4948] trunk/Src/Languages

From: <ge...@us...> - 2008-01-22 23:13:12

Revision: 4948
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4948&view=rev
Author:   gerundt
Date:     2008-01-22 15:13:10 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
Update all PO files after RFE #1699883

Modified Paths:
--------------
    trunk/Src/Languages/Brazilian.po
    trunk/Src/Languages/Bulgarian.po
    trunk/Src/Languages/Catalan.po
    trunk/Src/Languages/ChineseSimplified.po
    trunk/Src/Languages/ChineseTraditional.po
    trunk/Src/Languages/Croatian.po
    trunk/Src/Languages/Czech.po
    trunk/Src/Languages/Danish.po
    trunk/Src/Languages/Dutch.po
    trunk/Src/Languages/French.po
    trunk/Src/Languages/German.po
    trunk/Src/Languages/Hungarian.po
    trunk/Src/Languages/Italian.po
    trunk/Src/Languages/Japanese.po
    trunk/Src/Languages/Korean.po
    trunk/Src/Languages/Norwegian.po
    trunk/Src/Languages/Polish.po
    trunk/Src/Languages/Portuguese.po
    trunk/Src/Languages/Russian.po
    trunk/Src/Languages/Slovak.po
    trunk/Src/Languages/Spanish.po
    trunk/Src/Languages/Swedish.po
    trunk/Src/Languages/Turkish.po

Modified: trunk/Src/Languages/Brazilian.po
===================================================================
--- trunk/Src/Languages/Brazilian.po	2008-01-22 22:52:17 UTC (rev 4947)
+++ trunk/Src/Languages/Brazilian.po	2008-01-22 23:13:10 UTC (rev 4948)
@@ -71,7 +71,7 @@
 
 #: Merge.rc:81
 #: Merge.rc:103
-#: Merge.rc:495
+#: Merge.rc:498
 #, c-format
 msgid "&Copy"
 msgstr "&Copiar"
@@ -83,7 +83,7 @@
 msgstr "Co&lar"
 
 #: Merge.rc:84
-#: Merge.rc:576
+#: Merge.rc:579
 #, c-format
 msgid "&Goto..."
 msgstr ""
@@ -94,43 +94,43 @@
 msgstr ""
 
 #: Merge.rc:88
-#: Merge.rc:518
-#: Merge.rc:524
+#: Merge.rc:521
+#: Merge.rc:527
 #, c-format
 msgid "with &Registered Application"
 msgstr ""
 
 #: Merge.rc:89
-#: Merge.rc:519
-#: Merge.rc:525
+#: Merge.rc:522
+#: Merge.rc:528
 #, c-format
 msgid "with &External Editor"
 msgstr ""
 
 #: Merge.rc:90
-#: Merge.rc:520
-#: Merge.rc:526
+#: Merge.rc:523
+#: Merge.rc:529
 #, c-format
 msgid "&with..."
 msgstr ""
 
 #: Merge.rc:110
-#: Merge.rc:190
-#: Merge.rc:305
+#: Merge.rc:191
+#: Merge.rc:307
 #, c-format
 msgid "&File"
 msgstr "&Arquivo"
 
 #: Merge.rc:112
-#: Merge.rc:192
-#: Merge.rc:307
+#: Merge.rc:193
+#: Merge.rc:309
 #, c-format
 msgid "&New\tCtrl+N"
 msgstr "New\tCtrl+N"
 
 #: Merge.rc:113
-#: Merge.rc:193
-#: Merge.rc:308
+#: Merge.rc:194
+#: Merge.rc:310
 #, c-format
 msgid "&Open...\tCtrl+O"
 msgstr "&Abrir...\tCtrl+O"
@@ -146,8 +146,8 @@
 msgstr ""
 
 #: Merge.rc:117
-#: Merge.rc:196
-#: Merge.rc:311
+#: Merge.rc:197
+#: Merge.rc:313
 #, c-format
 msgid "Sa&ve Project..."
 msgstr ""
@@ -158,2448 +158,2455 @@
 msgstr ""
 
 #: Merge.rc:121
-#: Merge.rc:203
-#: Merge.rc:343
+#: Merge.rc:204
+#: Merge.rc:345
 #, c-format
 msgid "E&xit"
 msgstr "&Sair"
 
 #: Merge.rc:123
-#: Merge.rc:205
-#: Merge.rc:345
+#: Merge.rc:206
+#: Merge.rc:347
 #, c-format
 msgid "&Edit"
 msgstr "&Editar"
 
 #: Merge.rc:125
-#: Merge.rc:209
-#: Merge.rc:379
+#: Merge.rc:210
+#: Merge.rc:381
 #, c-format
 msgid "&Options..."
 msgstr "Op\xE7\xF5e&s..."
 
 #: Merge.rc:127
-#: Merge.rc:211
-#: Merge.rc:381
+#: Merge.rc:212
+#: Merge.rc:383
 #, c-format
 msgid "&View"
 msgstr "E&xibir"
 
 #: Merge.rc:129
-#: Merge.rc:222
-#: Merge.rc:383
+#: Merge.rc:223
+#: Merge.rc:385
 #, c-format
 msgid "Select &Font..."
 msgstr "Escolher &Fonte..."
 
 #: Merge.rc:130
-#: Merge.rc:223
-#: Merge.rc:384
+#: Merge.rc:224
+#: Merge.rc:386
 #, c-format
 msgid "Use Default F&ont"
 msgstr "Usar F&onte Padr\xE3o"
 
 #: Merge.rc:132
-#: Merge.rc:225
-#: Merge.rc:401
+#: Merge.rc:226
+#: Merge.rc:403
 #, c-format
 msgid "&Toolbar"
 msgstr ""
 
 #: Merge.rc:134
-#: Merge.rc:227
-#: Merge.rc:403
+#: Merge.rc:228
+#: Merge.rc:405
 #, c-format
 msgid "&None"
 msgstr ""
 
 #: Merge.rc:135
-#: Merge.rc:228
-#: Merge.rc:404
+#: Merge.rc:229
+#: Merge.rc:406
 #, c-format
 msgid "&Small"
 msgstr ""
 
 #: Merge.rc:136
-#: Merge.rc:229
-#: Merge.rc:405
+#: Merge.rc:230
+#: Merge.rc:407
 #, c-format
 msgid "&Big"
 msgstr ""
 
 #: Merge.rc:138
-#: Merge.rc:231
-#: Merge.rc:407
+#: Merge.rc:232
+#: Merge.rc:409
 #, c-format
 msgid "&Status Bar"
 msgstr "Barra de &Status"
 
 #: Merge.rc:139
-#: Merge.rc:232
-#: Merge.rc:408
+#: Merge.rc:233
+#: Merge.rc:410
 #, c-format
 msgid "Ta&b Bar"
 msgstr ""
 
 #: Merge.rc:141
-#: Merge.rc:235
-#: Merge.rc:412
+#: Merge.rc:236
+#: Merge.rc:414
 #, c-format
 msgid "&Language..."
 msgstr "&Idioma..."
 
 #: Merge.rc:143
-#: Merge.rc:256
-#: Merge.rc:434
+#: Merge.rc:257
+#: Merge.rc:436
 #, c-format
 msgid "&Tools"
 msgstr ""
 
 #: Merge.rc:145
-#: Merge.rc:259
-#: Merge.rc:436
+#: Merge.rc:260
+#: Merge.rc:438
 #, c-format
 msgid "&Filters..."
 msgstr ""
 
 #: Merge.rc:146
-#: Merge.rc:260
-#: Merge.rc:437
+#: Merge.rc:261
+#: Merge.rc:439
 #, c-format
 msgid "&Generate Patch..."
 msgstr ""
 
 #: Merge.rc:148
-#: Merge.rc:263
-#: Merge.rc:440
+#: Merge.rc:264
+#: Merge.rc:442
 #, c-format
 msgid "&Plugins"
 msgstr ""
 
 #: Merge.rc:150
-#: Merge.rc:265
-#: Merge.rc:442
+#: Merge.rc:266
+#: Merge.rc:444
 #, c-format
 msgid "&Manual Unpacking"
 msgstr ""
 
 #: Merge.rc:151
-#: Merge.rc:266
-#: Merge.rc:443
+#: Merge.rc:267
+#: Merge.rc:445
 #, c-format
 msgid "&Automatic Unpacking"
 msgstr ""
 
 #: Merge.rc:153
-#: Merge.rc:268
-#: Merge.rc:445
+#: Merge.rc:269
+#: Merge.rc:447
 #, c-format
 msgid "&Edit with Unpacker"
 msgstr ""
 
 #: Merge.rc:155
-#: Merge.rc:270
-#: Merge.rc:452
+#: Merge.rc:271
+#: Merge.rc:454
 #, c-format
 msgid "&Reload plugins"
 msgstr ""
 
 #: Merge.rc:157
-#: Merge.rc:272
-#: Merge.rc:454
+#: Merge.rc:273
+#: Merge.rc:456
 #, c-format
 msgid "&Debug"
 msgstr ""
 
 #: Merge.rc:159
-#: Merge.rc:274
-#: Merge.rc:456
+#: Merge.rc:275
+#: Merge.rc:458
 #, c-format
 msgid "&Load Config..."
 msgstr ""
 
 #: Merge.rc:160
-#: Merge.rc:275
-#: Merge.rc:457
+#: Merge.rc:276
+#: Merge.rc:459
 #, c-format
 msgid "&Reset Options"
 msgstr ""
 
 #: Merge.rc:162
-#: Merge.rc:277
-#: Merge.rc:459
+#: Merge.rc:278
+#: Merge.rc:461
 #, c-format
 msgid "&Window"
 msgstr "Ja&nela"
 
 #: Merge.rc:164
-#: Merge.rc:279
-#: Merge.rc:461
+#: Merge.rc:280
+#: Merge.rc:463
 #, c-format
 msgid "Cl&ose"
 msgstr "Fechar"
 
 #: Merge.rc:165
-#: Merge.rc:280
-#: Merge.rc:462
+#: Merge.rc:281
+#: Merge.rc:464
 #, c-format
 msgid "Clo&se All"
 msgstr ""
 
 #: Merge.rc:167
-#: Merge.rc:282
-#: Merge.rc:464
+#: Merge.rc:283
+#: Merge.rc:466
 #, c-format
 msgid "Change &Pane\tF6"
 msgstr ""
 
 #: Merge.rc:169
-#: Merge.rc:284
-#: Merge.rc:466
+#: Merge.rc:285
+#: Merge.rc:468
 #, c-format
 msgid "Tile &Horizontally"
 msgstr "Dividir &Horizontalmente"
 
 #: Merge.rc:170
-#: Merge.rc:285
-#: Merge.rc:467
+#: Merge.rc:286
+#: Merge.rc:469
 #, c-format
 msgid "Tile &Vertically"
 msgstr "Dividir &Verticalmente"
 
 #: Merge.rc:171
-#: Merge.rc:286
-#: Merge.rc:468
+#: Merge.rc:287
+#: Merge.rc:470
 #, c-format
 msgid "&Cascade"
 msgstr "Em &Cascata"
 
 #: Merge.rc:173
-#: Merge.rc:288
-#: Merge.rc:470
-#: Merge.rc:1884
+#: Merge.rc:289
+#: Merge.rc:472
+#: Merge.rc:1887
 #, c-format
 msgid "&Help"
 msgstr "A&juda"
 
 #: Merge.rc:175
-#: Merge.rc:290
-#: Merge.rc:472
+#: Merge.rc:291
+#: Merge.rc:474
 #, c-format
 msgid "&Contents...\tF1"
 msgstr "&Conte\xFAdo...\tF1"
 
 #: Merge.rc:176
-#: Merge.rc:291
-#: Merge.rc:473
+#: Merge.rc:292
+#: Merge.rc:475
 #, c-format
 msgid "&Index..."
 msgstr ""
 
 #: Merge.rc:177
-#: Merge.rc:292
-#: Merge.rc:474
+#: Merge.rc:293
+#: Merge.rc:476
 #, c-format
 msgid "&Search..."
 msgstr ""
 
 #: Merge.rc:179
-#: Merge.rc:294
-#: Merge.rc:476
+#: Merge.rc:295
+#: Merge.rc:478
 #, c-format
 msgid "R&elease Notes"
 msgstr ""
 
 #: Merge.rc:180
-#: Merge.rc:295
-#: Merge.rc:477
+#: Merge.rc:296
+#: Merge.rc:479
 #, c-format
-msgid "C&onfiguration..."
+msgid "&Translations"
 msgstr ""
 
 #: Merge.rc:181
-#: Merge.rc:296
-#: Merge.rc:478
+#: Merge.rc:297
+#: Merge.rc:480
 #, c-format
-msgid "A&rchive Support disabled..."
+msgid "C&onfiguration..."
 msgstr ""
 
-#: Merge.rc:183
+#: Merge.rc:182
 #: Merge.rc:298
-#: Merge.rc:480
+#: Merge.rc:481
 #, c-format
+msgid "A&rchive Support disabled..."
+msgstr ""
+
+#: Merge.rc:184
+#: Merge.rc:300
+#: Merge.rc:483
+#, c-format
 msgid "&GNU Public License..."
 msgstr "Licen\xE7a P\xFAblica GNU..."
 
-#: Merge.rc:184
-#: Merge.rc:299
-#: Merge.rc:481
+#: Merge.rc:185
+#: Merge.rc:301
+#: Merge.rc:484
 #, c-format
 msgid "&About WinMerge..."
 msgstr "&Sobre o WinMerge..."
 
-#: Merge.rc:195
-#: Merge.rc:310
+#: Merge.rc:196
+#: Merge.rc:312
 #, c-format
 msgid "Open Pro&ject...\tCtrl+J"
 msgstr ""
 
-#: Merge.rc:198
-#: Merge.rc:329
+#: Merge.rc:199
+#: Merge.rc:331
 #, c-format
 msgid "L&eft Read-only"
 msgstr ""
 
-#: Merge.rc:199
-#: Merge.rc:330
+#: Merge.rc:200
+#: Merge.rc:332
 #, c-format
 msgid "Ri&ght Read-only"
 msgstr ""
 
-#: Merge.rc:201
+#: Merge.rc:202
 #, c-format
 msgid "File En&coding"
 msgstr ""
 
-#: Merge.rc:207
-#: Merge.rc:355
+#: Merge.rc:208
+#: Merge.rc:357
 #, c-format
 msgid "Select &All\tCtrl+A"
 msgstr ""
 
-#: Merge.rc:213
+#: Merge.rc:214
 #, c-format
 msgid "Show &Identical Items"
 msgstr ""
 
-#: Merge.rc:214
+#: Merge.rc:215
 #, c-format
 msgid "Show &Different Items"
 msgstr ""
 
-#: Merge.rc:215
+#: Merge.rc:216
 #, c-format
 msgid "Show L&eft Unique Items"
 msgstr ""
 
-#: Merge.rc:216
+#: Merge.rc:217
 #, c-format
 msgid "Show Ri&ght Unique Items"
 msgstr ""
 
-#: Merge.rc:217
+#: Merge.rc:218
 #, c-format
 msgid "Show S&kipped Items"
 msgstr ""
 
-#: Merge.rc:218
+#: Merge.rc:219
 #, c-format
 msgid "S&how Binary Files"
 msgstr ""
 
-#: Merge.rc:220
+#: Merge.rc:221
 #, c-format
 msgid "Show Hidd&en Items"
 msgstr ""
 
-#: Merge.rc:233
+#: Merge.rc:234
 #, c-format
 msgid "Compa&re Statistics"
 msgstr ""
 
-#: Merge.rc:237
-#: Merge.rc:414
+#: Merge.rc:238
+#: Merge.rc:416
 #, c-format
 msgid "Refre&sh\tF5"
 msgstr "Atuali&zar\tF5"
 
-#: Merge.rc:238
+#: Merge.rc:239
 #, c-format
 msgid "&Refresh Selected\tCtrl+F5"
 msgstr ""
 
-#: Merge.rc:240
-#: Merge.rc:416
+#: Merge.rc:241
+#: Merge.rc:418
 #, c-format
 msgid "&Merge"
 msgstr ""
 
-#: Merge.rc:242
+#: Merge.rc:243
 #, c-format
 msgid "Co&mpare\tEnter"
 msgstr ""
 
-#: Merge.rc:244
-#: Merge.rc:418
+#: Merge.rc:245
+#: Merge.rc:420
 #, c-format
 msgid "&Next Difference\tAlt+Down"
 msgstr "&Pr\xF3xima diferen\xE7a\tAlt+Down"
 
-#: Merge.rc:245
-#: Merge.rc:419
+#: Merge.rc:246
+#: Merge.rc:421
 #, c-format
 msgid "&Previous Difference\tAlt+Up"
 msgstr "Diferen\xE7a &anterior\tAlt+Up"
 
-#: Merge.rc:247
-#: Merge.rc:421
+#: Merge.rc:248
+#: Merge.rc:423
 #, c-format
 msgid "&First Difference\tAlt+Home"
 msgstr "Primeira &Diferen\xE7a\tAlt+Home"
 
-#: Merge.rc:248
-#: Merge.rc:422
+#: Merge.rc:249
+#: Merge.rc:424
 #, c-format
 msgid "&Current Difference\tAlt+Enter"
 msgstr "Diferen\xE7a Corre&nte\tAlt+Enter"
 
-#: Merge.rc:249
-#: Merge.rc:423
+#: Merge.rc:250
+#: Merge.rc:425
 #, c-format
 msgid "&Last Difference\tAlt+End"
 msgstr "&Ultima Diferen\xE7a\tAlt+End"
 
-#: Merge.rc:251
-#: Merge.rc:425
+#: Merge.rc:252
+#: Merge.rc:427
 #, c-format
 msgid "Copy to &Right\tAlt+Right"
 msgstr "Copiar para a &Direita\tAlt+Right"
 
-#: Merge.rc:252
-#: Merge.rc:426
+#: Merge.rc:253
+#: Merge.rc:428
 #, c-format
 msgid "Copy to L&eft\tAlt+Left"
 msgstr "Copiar para a &Esquerda\tAlt+Left"
 
-#: Merge.rc:254
+#: Merge.rc:255
 #, c-format
 msgid "&Delete\tDel"
 msgstr ""
 
-#: Merge.rc:258
-#: Merge.rc:549
+#: Merge.rc:259
+#: Merge.rc:552
 #, c-format
 msgid "&Customize Columns..."
 msgstr ""
 
-#: Merge.rc:261
-#: Merge.rc:438
+#: Merge.rc:262
+#: Merge.rc:440
 #, c-format
 msgid "Generate &Report..."
 msgstr ""
 
-#: Merge.rc:313
+#: Merge.rc:315
 #, c-format
 msgid "&Save\tCtrl+S"
 msgstr "Sal&var\tCtrl+S"
 
-#: Merge.rc:314
+#: Merge.rc:316
 #, c-format
 msgid "Save &Left"
 msgstr ""
 
-#: Merge.rc:316
-#: Merge.rc:321
+#: Merge.rc:318
+#: Merge.rc:323
 #, c-format
 msgid "&Save"
 msgstr ""
 
-#: Merge.rc:317
-#: Merge.rc:322
+#: Merge.rc:319
+#: Merge.rc:324
 #, c-format
 msgid "Save &As..."
 msgstr ""
 
-#: Merge.rc:319
+#: Merge.rc:321
 #, c-format
 msgid "Save &Right"
 msgstr ""
 
-#: Merge.rc:325
+#: Merge.rc:327
 #, c-format
 msgid "&Print..."
 msgstr ""
 
-#: Merge.rc:326
+#: Merge.rc:328
 #, c-format
 msgid "Page Se&tup"
 msgstr ""
 
-#: Merge.rc:327
+#: Merge.rc:329
 #, c-format
 msgid "Print Previe&w"
 msgstr ""
 
-#: Merge.rc:332
+#: Merge.rc:334
 #, c-format
 msgid "&Convert Line Endings to"
 msgstr ""
 
-#: Merge.rc:334
+#: Merge.rc:336
 #, c-format
 msgid "&DOS (CRLF)"
 msgstr ""
 
-#: Merge.rc:335
+#: Merge.rc:337
 #, c-format
 msgid "&UNIX (LF)"
 msgstr ""
 
-#: Merge.rc:336
+#: Merge.rc:338
 #, c-format
 msgid "&MAC (CR)"
 msgstr ""
 
-#: Merge.rc:339
+#: Merge.rc:341
 #, c-format
 msgid "&Merge Mode\tF9"
 msgstr ""
 
-#: Merge.rc:341
+#: Merge.rc:343
 #, c-format
 msgid "&File Encoding..."
 msgstr ""
 
-#: Merge.rc:347
+#: Merge.rc:349
 #, c-format
 msgid "&Undo\tCtrl+Z"
 msgstr "&Desfazer\tCtrl+Z"
 
-#: Merge.rc:348
+#: Merge.rc:350
 #, c-format
 msgid "&Redo\tCtrl+Y"
 msgstr "&Refazer\tCtrl+Y"
 
-#: Merge.rc:350
+#: Merge.rc:352
 #, c-format
 msgid "Cu&t\tCtrl+X"
 msgstr "Cor&tar\tCtrl+X"
 
-#: Merge.rc:351
+#: Merge.rc:353
 #, c-format
 msgid "&Copy\tCtrl+C"
 msgstr "&Copiar\tCtrl+C"
 
-#: Merge.rc:352
+#: Merge.rc:354
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr "Co&lar\tCtrl+V"
 
-#: Merge.rc:354
+#: Merge.rc:356
 #, c-format
 msgid "Select Line &Difference\tF4"
 msgstr ""
 
-#: Merge.rc:357
+#: Merge.rc:359
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr "Pr&ocurar...\tCtrl+F"
 
-#: Merge.rc:358
+#: Merge.rc:360
 #, c-format
 msgid "Repla&ce...\tCtrl+H"
 msgstr "Al&terar...\tCtrl+H"
 
-#: Merge.rc:360
+#: Merge.rc:362
 #, c-format
 msgid "&Scripts"
 msgstr ""
 
-#: Merge.rc:362
-#: Merge.rc:2870
+#: Merge.rc:364
+#: Merge.rc:2874
 #, c-format
 msgid "< Empty >"
 msgstr ""
 
-#: Merge.rc:365
+#: Merge.rc:367
 #, c-format
 msgid "Advanced"
 msgstr ""
 
-#: Merge.rc:367
+#: Merge.rc:369
 #, c-format
 msgid "&Copy With Line Numbers\tCtrl+Shift+C"
 msgstr ""
 
-#: Merge.rc:370
+#: Merge.rc:372
 #, c-format
 msgid "&Bookmarks"
 msgstr ""
 
-#: Merge.rc:372
+#: Merge.rc:374
 #, c-format
 msgid "&Toggle Bookmark\tCtrl+F2"
 msgstr ""
 
-#: Merge.rc:373
+#: Merge.rc:375
 #, c-format
 msgid "&Next Bookmark\tF2"
 msgstr ""
 
-#: Merge.rc:374
+#: Merge.rc:376
 #, c-format
 msgid "&Previous bookmark\tShift+F2"
 msgstr ""
 
-#: Merge.rc:375
+#: Merge.rc:377
 #, c-format
 msgid "&Clear All Bookmarks"
 msgstr ""
 
-#: Merge.rc:377
+#: Merge.rc:379
 #, c-format
 msgid "&Go To...\tCtrl+G"
 msgstr ""
 
-#: Merge.rc:385
+#: Merge.rc:387
 #, c-format
 msgid "Zoom In\tCtrl++"
 msgstr ""
 
-#: Merge.rc:386
+#: Merge.rc:388
 #, c-format
 msgid "Zoom Out\tCtrl+-"
 msgstr ""
 
-#: Merge.rc:387
+#: Merge.rc:389
 #, c-format
 msgid "Syntax Highlight"
 msgstr ""
 
-#: Merge.rc:392
+#: Merge.rc:394
 #, c-format
 msgid "&Lock Panes"
 msgstr ""
 
-#: Merge.rc:393
+#: Merge.rc:395
 #, c-format
 msgid "&View Whitespace"
 msgstr "E&xibir Espa\xE7os"
 
-#: Merge.rc:394
+#: Merge.rc:396
 #, c-format
 msgid "Vie&w Line Differences"
 msgstr ""
 
-#: Merge.rc:395
+#: Merge.rc:397
 #, c-format
 msgid "View Line &Numbers"
 msgstr ""
 
-#: Merge.rc:396
+#: Merge.rc:398
 #, c-format
 msgid "View &Margins"
 msgstr ""
 
-#: Merge.rc:397
+#: Merge.rc:399
 #, c-format
 msgid "W&rap Lines"
 msgstr ""
 
-#: Merge.rc:399
+#: Merge.rc:401
 #, c-format
 msgid "Sw&ap Panes"
 msgstr ""
 
-#: Merge.rc:409
+#: Merge.rc:411
 #, c-format
 msgid "Diff &Pane"
 msgstr ""
 
-#: Merge.rc:410
+#: Merge.rc:412
 #, c-format
 msgid "Lo&cation Pane"
 msgstr "Location &Pane"
 
-#: Merge.rc:428
+#: Merge.rc:430
 #, c-format
 msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
 msgstr "Copy to Right and Advance\tAlt+Ctrl+Right"
 
-#: Merge.rc:429
+#: Merge.rc:431
 #, c-format
 msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
 msgstr "Copy to Left and Advance\tAlt+Ctrl+Left"
 
-#: Merge.rc:431
+#: Merge.rc:433
 #, c-format
 msgid "Copy &All to Right"
 msgstr "Copiar tudo para a Direita"
 
-#: Merge.rc:432
+#: Merge.rc:434
 #, c-format
 msgid "Cop&y All to Left"
 msgstr "Copiar tudo para a Esquerda"
 
-#: Merge.rc:447
+#: Merge.rc:449
 #, c-format
 msgid "&Prediffer"
 msgstr ""
 
-#: Merge.rc:489
+#: Merge.rc:492
 #, c-format
 msgid "Comp&are"
 msgstr ""
 
-#: Merge.rc:490
+#: Merge.rc:493
 #, c-format
 msgid "Co&mpare Special"
 msgstr ""
 
-#: Merge.rc:492
+#: Merge.rc:495
 #, c-format
 msgid "&XML"
 msgstr ""
 
-#: Merge.rc:497
+#: Merge.rc:500
 #, c-format
 msgid "&Left to Right"
 msgstr ""
 
-#: Merge.rc:498
+#: Merge.rc:501
 #, c-format
 msgid "L&eft to..."
 msgstr ""
 
-#: Merge.rc:499
+#: Merge.rc:502
 #, c-format
 msgid "&Right to Left"
 msgstr ""
 
-#: Merge.rc:500
+#: Merge.rc:503
 #, c-format
 msgid "R&ight to..."
 msgstr ""
 
-#: Merge.rc:502
+#: Merge.rc:505
 #, c-format
 msgid "&Move"
 msgstr ""
 
-#: Merge.rc:504
+#: Merge.rc:507
 #, c-format
 msgid "&Left to..."
 msgstr ""
 
-#: Merge.rc:505
+#: Merge.rc:508
 #, c-format
 msgid "&Right to..."
 msgstr ""
 
-#: Merge.rc:507
+#: Merge.rc:510
 #, c-format
 msgid "&Delete"
 msgstr ""
 
-#: Merge.rc:509
-#: Merge.rc:1121
-#: Merge.rc:1500
+#: Merge.rc:512
+#: Merge.rc:1124
+#: Merge.rc:1503
 #, c-format
 msgid "&Left"
 msgstr ""
 
-#: Merge.rc:510
-#: Merge.rc:1123
-#: Merge.rc:1503
+#: Merge.rc:513
+#: Merge.rc:1126
+#: Merge.rc:1506
 #, c-format
 msgid "&Right"
 msgstr ""
 
-#: Merge.rc:511
+#: Merge.rc:514
 #, c-format
 msgid "&Both"
 msgstr ""
 
-#: Merge.rc:513
+#: Merge.rc:516
 #, c-format
 msgid "Re&name"
 msgstr ""
 
-#: Merge.rc:514
+#: Merge.rc:517
 #, c-format
 msgid "&Hide Items"
 msgstr ""
 
-#: Merge.rc:516
+#: Merge.rc:519
 #, c-format
 msgid "&Open Left"
 msgstr ""
 
-#: Merge.rc:522
+#: Merge.rc:525
 #, c-format
 msgid "O&pen Right"
 msgstr ""
 
-#: Merge.rc:529
+#: Merge.rc:532
 #, c-format
 msgid "Cop&y Pathnames"
 msgstr ""
 
-#: Merge.rc:531
+#: Merge.rc:534
 #, c-format
 msgid "&Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:532
+#: Merge.rc:535
 #, c-format
 msgid "&Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:533
+#: Merge.rc:536
 #, c-format
 msgid "&Both (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:535
+#: Merge.rc:538
 #, c-format
 msgid "Copy &Filenames"
 msgstr ""
 
-#: Merge.rc:537
+#: Merge.rc:540
 #, c-format
 msgid "&Zip"
 msgstr ""
 
-#: Merge.rc:539
+#: Merge.rc:542
 #, c-format
 msgid "&Left... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:540
+#: Merge.rc:543
 #, c-format
 msgid "&Right... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:541
+#: Merge.rc:544
 #, c-format
 msgid "&Both... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:542
+#: Merge.rc:545
 #, c-format
 msgid "&Differences... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:545
+#: Merge.rc:548
 #, c-format
 msgid "&Refresh"
 msgstr ""
 
-#: Merge.rc:557
+#: Merge.rc:560
 #, c-format
 msgid "&Copy Full Path"
 msgstr ""
 
-#: Merge.rc:558
+#: Merge.rc:561
 #, c-format
 msgid "Copy &Filename"
 msgstr ""
 
-#: Merge.rc:564
+#: Merge.rc:567
 #, c-format
 msgid "Prediffer Settings"
 msgstr ""
 
-#: Merge.rc:566
+#: Merge.rc:569
 #, c-format
 msgid "&No prediffer"
 msgstr ""
 
-#: Merge.rc:567
+#: Merge.rc:570
 #, c-format
 msgid "Auto prediffer"
 msgstr ""
 
-#: Merge.rc:575
+#: Merge.rc:578
 #, c-format
 msgid "G&oto Diff"
 msgstr ""
 
-#: Merge.rc:578
+#: Merge.rc:581
 #, c-format
 msgid "&No Moved Blocks"
 msgstr ""
 
-#: Merge.rc:579
+#: Merge.rc:582
 #, c-format
 msgid "&All Moved Blocks"
 msgstr ""
 
-#: Merge.rc:580
+#: Merge.rc:583
 #, c-format
 msgid "Moved Block for &Current Diff"
 msgstr ""
 
-#: Merge.rc:648
+#: Merge.rc:651
 #, c-format
 msgid "About WinMerge"
 msgstr "Sobre o WinMerge"
 
-#: Merge.rc:654
+#: Merge.rc:657
 #, c-format
 msgid "(Private Build)"
 msgstr ""
 
-#: Merge.rc:655
+#: Merge.rc:658
 #, c-format
 msgid "All rights reserved."
 msgstr "Todos os direitos reservados."
 
-#: Merge.rc:656
+#: Merge.rc:659
 #, c-format
 msgid "Visit the WinMerge HomePage!"
 msgstr "Visite o site do WinMerge!"
 
-#: Merge.rc:659
-#: Merge.rc:690
-#: Merge.rc:780
-#: Merge.rc:966
-#: Merge.rc:1040
-#: Merge.rc:1069
-#: Merge.rc:1079
-#: Merge.rc:1242
-#: Merge.rc:1306
-#: Merge.rc:1319
-#: Merge.rc:1411
-#: Merge.rc:1426
+#: Merge.rc:662
+#: Merge.rc:693
+#: Merge.rc:783
+#: Merge.rc:969
+#: Merge.rc:1043
+#: Merge.rc:1072
+#: Merge.rc:1082
+#: Merge.rc:1245
+#: Merge.rc:1309
+#: Merge.rc:1322
+#: Merge.rc:1414
+#: Merge.rc:1429
 #, c-format
 msgid "OK"
 msgstr ""
 
-#: Merge.rc:660
+#: Merge.rc:663
 #, c-format
 msgid "Contributors"
 msgstr ""
 
-#: Merge.rc:666
+#: Merge.rc:669
 #, c-format
 msgid "Select Files or Folders"
 msgstr "Selecione Arquivos ou Diret\xF3rios..."
 
-#: Merge.rc:669
-#: Merge.rc:1577
+#: Merge.rc:672
+#: Merge.rc:1580
 #, c-format
 msgid "&Left:"
 msgstr "&Esquerda:"
 
-#: Merge.rc:673
-#: Merge.rc:734
-#: Merge.rc:990
-#: Merge.rc:1005
+#: Merge.rc:676
+#: Merge.rc:737
+#: Merge.rc:993
+#: Merge.rc:1008
 #, c-format
 msgid "&Browse..."
 msgstr "&Procurar..."
 
-#: Merge.rc:674
-#: Merge.rc:1581
+#: Merge.rc:677
+#: Merge.rc:1584
 #, c-format
 msgid "&Right:"
 msgstr "&Direita:"
 
-#: Merge.rc:678
-#: Merge.rc:1016
+#: Merge.rc:681
+#: Merge.rc:1019
 #, c-format
 msgid "Bro&wse..."
 msgstr "Pro&curar..."
 
-#: Merge.rc:679
-#: Merge.rc:1585
+#: Merge.rc:682
+#: Merge.rc:1588
 #, c-format
 msgid "&Filter:"
 msgstr ""
 
-#: Merge.rc:682
-#: Merge.rc:1587
+#: Merge.rc:685
+#: Merge.rc:1590
 #, c-format
 msgid "Select..."
 msgstr ""
 
-#: Merge.rc:683
+#: Merge.rc:686
 #, c-format
 msgid "&Unpacker:"
 msgstr ""
 
-#: Merge.rc:686
+#: Merge.rc:689
 #, c-format
 msgid "&Select..."
 msgstr ""
 
-#: Merge.rc:687
-#: Merge.rc:1588
+#: Merge.rc:690
+#: Merge.rc:1591
 #, c-format
 msgid "&Include Subfolders"
 msgstr ""
 
-#: Merge.rc:689
+#: Merge.rc:692
 #, c-format
 msgid "Status:"
 msgstr ""
 
-#: Merge.rc:691
-#: Merge.rc:721
-#: Merge.rc:781
-#: Merge.rc:811
-#: Merge.rc:843
-#: Merge.rc:853
-#: Merge.rc:1041
-#: Merge.rc:1070
-#: Merge.rc:1080
-#: Merge.rc:1131
-#: Merge.rc:1243
-#: Merge.rc:1320
-#: Merge.rc:1412
-#: Merge.rc:1427
+#: Merge.rc:694
+#: Merge.rc:724
+#: Merge.rc:784
+#: Merge.rc:814
+#: Merge.rc:846
+#: Merge.rc:856
+#: Merge.rc:1044
+#: Merge.rc:1073
+#: Merge.rc:1083
+#: Merge.rc:1134
+#: Merge.rc:1246
+#: Merge.rc:1323
+#: Merge.rc:1415
+#: Merge.rc:1430
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Merge.rc:692
-#: Merge.rc:1321
+#: Merge.rc:695
+#: Merge.rc:1324
 #, c-format
 msgid "Help"
 msgstr ""
 
-#: Merge.rc:693
+#: Merge.rc:696
 #, c-format
 msgid "Files or Folders to Compare"
 msgstr "Arquivos ou Diret\xF3rios a Comparar"
 
-#: Merge.rc:700
+#: Merge.rc:703
 #, c-format
 msgid "Visual SourceSafe"
 msgstr ""
 
-#: Merge.rc:705
+#: Merge.rc:708
 #, c-format
 msgid "Database:"
 msgstr ""
 
-#: Merge.rc:708
+#: Merge.rc:711
 #, c-format
 msgid "Project:"
 msgstr ""
 
-#: Merge.rc:711
+#: Merge.rc:714
 #, c-format
 msgid "User:"
 msgstr ""
 
-#: Merge.rc:713
+#: Merge.rc:716
 #, c-format
 msgid "Password:"
 msgstr ""
 
-#: Merge.rc:715
+#: Merge.rc:718
 #, c-format
 msgid "Link to Destination VSS project"
 msgstr ""
 
-#: Merge.rc:717
-#: Merge.rc:858
+#: Merge.rc:720
+#: Merge.rc:861
 #, c-format
 msgid "Apply to all items"
 msgstr ""
 
-#: Merge.rc:719
+#: Merge.rc:722
 #, c-format
 msgid "Check Out"
 msgstr ""
 
-#: Merge.rc:720
-#: Merge.rc:854
+#: Merge.rc:723
+#: Merge.rc:857
 #, c-format
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: Merge.rc:726
+#: Merge.rc:729
 #, c-format
 msgid "Versioning System"
 msgstr "Sistema de Vers\xF5es"
 
-#: Merge.rc:729
+#: Merge.rc:732
 #, c-format
 msgid "&Versioning System:"
 msgstr "Sistema de &Vers\xF5es:"
 
-#: Merge.rc:732
+#: Merge.rc:735
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Caminho para cleartool.exe:"
 
-#: Merge.rc:739
-#: Merge.rc:1892
+#: Merge.rc:742
+#: Merge.rc:1895
 #, c-format
 msgid "General"
 msgstr "Geral"
 
-#: Merge.rc:742
+#: Merge.rc:745
 #, c-format
 msgid "Automatically &scroll to first difference"
 msgstr "Posicionar a&utomaticamente na primeira diferen\xE7a"
 
-#: Merge.rc:745
+#: Merge.rc:748
 #, c-format
 msgid "&Disable Splash Screen"
 msgstr "&Desabilitar Splash Screen"
 
-#: Merge.rc:747
+#: Merge.rc:750
 #, c-format
 msgid "Cl&ose windows with ESC"
 msgstr ""
 
-#: Merge.rc:749
+#: Merge.rc:752
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
 msgstr ""
 
-#: Merge.rc:752
+#: Merge.rc:755
 #, c-format
 msgid "All&ow only one instance to run"
 msgstr ""
 
-#: Merge.rc:754
+#: Merge.rc:757
 #, c-format
 msgid "As&k when closing multiple windows"
 msgstr ""
 
-#: Merge.rc:756
+#: Merge.rc:759
 #, c-format
 msgid "&Preserve file time in file compare"
 msgstr ""
 
-#: Merge.rc:759
+#: Merge.rc:762
 #, c-format
 msgid "O&pen-dialog Auto-Completion:"
 msgstr ""
 
-#: Merge.rc:762
+#: Merge.rc:765
 #, c-format
 msgid "Enable multiple compare windows for"
 msgstr ""
 
-#: Merge.rc:764
-#: Merge.rc:1600
+#: Merge.rc:767
+#: Merge.rc:1603
 #, c-format
 msgid "&Folder compare"
 msgstr ""
 
-#: Merge.rc:766
-#: Merge.rc:1602
+#: Merge.rc:769
+#: Merge.rc:1605
 #, c-format
 msgid "Fil&e compare"
 msgstr ""
 
-#: Merge.rc:768
+#: Merge.rc:771
 #, c-format
 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
 msgstr ""
 
-#: Merge.rc:770
+#: Merge.rc:773
 #, c-format
 msgid "Reset"
 msgstr ""
 
-#: Merge.rc:777
+#: Merge.rc:780
 #, c-format
 msgid "Language"
 msgstr "Idiomas"
 
-#: Merge.rc:784
+#: Merge.rc:787
 #, c-format
 msgid "Available languages:"
 msgstr "Idiomas dispon\xEDveis:"
 
-#: Merge.rc:790
+#: Merge.rc:793
 #, c-format
 msgid "Find"
 msgstr "Localizar"
 
-#: Merge.rc:793
-#: Merge.rc:820
+#: Merge.rc:796
+#: Merge.rc:823
 #, c-format
 msgid "Fi&nd what:"
 msgstr "&Localizar:"
 
-#: Merge.rc:796
-#: Merge.rc:826
+#: Merge.rc:799
+#: Merge.rc:829
 #, c-format
 msgid "Match &whole word only"
 msgstr "Somente p&alavras iguais"
 
-#: Merge.rc:798
-#: Merge.rc:828
+#: Merge.rc:801
+#: Merge.rc:831
 #, c-format
 msgid "Match &case"
 msgstr "&Diferenciar mai\xFAsculas de min\xFAsculas"
 
-#: Merge.rc:800
-#: Merge.rc:830
+#: Merge.rc:803
+#: Merge.rc:833
 #, c-format
 msgid "Regular &expression"
 msgstr "&Express\xE3o regular"
 
-#: Merge.rc:802
+#: Merge.rc:805
 #, c-format
 msgid "D&on't wrap end of file"
 msgstr ""
 
-#: Merge.rc:805
+#: Merge.rc:808
 #, c-format
 msgid "Direction"
 msgstr "Dire\xE7\xE3o"
 
-#: Merge.rc:806
+#: Merge.rc:809
 #, c-format
 msgid "&Up"
 msgstr "A&cima"
 
-#: Merge.rc:808
+#: Merge.rc:811
 #, c-format
 msgid "&Down"
 msgstr "A&baixo"
 
-#: Merge.rc:810
-#: Merge.rc:840
+#: Merge.rc:813
+#: Merge.rc:843
 #, c-format
 msgid "&Find Next"
 msgstr "&Pr\xF3ximo"
 
-#: Merge.rc:817
+#: Merge.rc:820
 #, c-format
 msgid "Replace"
 msgstr "Localizar e Substituir"
 
-#: Merge.rc:823
+#: Merge.rc:826
 #, c-format
 msgid "Re&place with:"
 msgstr "Su&bstituir por:"
 
-#: Merge.rc:832
+#: Merge.rc:835
 #, c-format
 msgid "&Don't wrap end of file"
 msgstr ""
 
-#: Merge.rc:835
+#: Merge.rc:838
 #, c-format
 msgid "Replace in"
 msgstr "Substituir"
 
-#: Merge.rc:836
+#: Merge.rc:839
 #, c-format
 msgid "&Selection"
 msgstr "Somente &na sele\xE7\xE3o"
 
-#: Merge.rc:838
+#: Merge.rc:841
 #, c-format
 msgid "Wh&ole file"
 msgstr "Em todo &documento"
 
-#: Merge.rc:841
+#: Merge.rc:844
 #, c-format
 msgid "&Replace"
 msgstr "&Substituir"
 
-#: Merge.rc:842
+#: Merge.rc:845
 #, c-format
 msgid "Replace &All"
 msgstr "&Todos"
 
-#: Merge.rc:849
-#: Merge.rc:2120
+#: Merge.rc:852
+#: Merge.rc:2123
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
 
-#: Merge.rc:852
+#: Merge.rc:855
 #, c-format
 msgid "CheckOut"
 msgstr ""
 
-#: Merge.rc:857
-#: Merge.rc:1162
+#: Merge.rc:860
+#: Merge.rc:1165
 #, c-format
 msgid "Comments"
 msgstr "Coment\xE1rios"
 
-#: Merge.rc:860
+#: Merge.rc:863
 #, c-format
 msgid "CheckIn after checkout"
 msgstr ""
 
-#: Merge.rc:866
+#: Merge.rc:869
 #, c-format
 msgid "Linefilters"
 msgstr ""
 
-#: Merge.rc:869
+#: Merge.rc:872
 #, c-format
 msgid "Enable Line Filters"
 msgstr ""
 
-#: Merge.rc:872
+#: Merge.rc:875
 #, c-format
 msgid "Regular Expressions (one per line):"
 msgstr "Express\xF5es (uma por linha):"
 
-#: Merge.rc:879
+#: Merge.rc:882
 #, c-format
 msgid "Save"
 msgstr ""
 
-#: Merge.rc:880
+#: Merge.rc:883
 #, c-format
 msgid "New"
 msgstr ""
 
-#: Merge.rc:881
+#: Merge.rc:884
 #, c-format
 msgid "Edit"
 msgstr ""
 
-#: Merge.rc:882
+#: Merge.rc:885
 #, c-format
 msgid "Remove"
 msgstr ""
 
-#: Merge.rc:887
-#: Merge.rc:1895
+#: Merge.rc:890
+#: Merge.rc:1898
 #, c-format
 msgid "Colors"
 msgstr "Cores"
 
-#: Merge.rc:890
+#: Merge.rc:893
 #, c-format
 msgid "Difference:"
 msgstr "Diferen\xE7a:"
 
-#: Merge.rc:894
+#: Merge.rc:897
 #, c-format
 msgid "Selected Difference:"
 msgstr "Diferen\xE7a Selecionada:"
 
-#: Merge.rc:898
-#: Merge.rc:1552
+#: Merge.rc:901
+#: Merge.rc:1555
 #, c-format
 msgid "Background"
 msgstr ""
 
-#: Merge.rc:899
+#: Merge.rc:902
 #, c-format
 msgid "Deleted"
 msgstr ""
 
-#: Merge.rc:912
-#: Merge.rc:1347
-#: Merge.rc:1553
+#: Merge.rc:915
+#: Merge.rc:1350
+#: Merge.rc:1556
 #, c-format
 msgid "Text"
 msgstr ""
 
-#: Merge.rc:916
+#: Merge.rc:919
 #, c-format
 msgid "Ignored Difference:"
 msgstr ""
 
-#: Merge.rc:926
+#: Merge.rc:929
 #, c-format
 msgid "Moved:"
 msgstr ""
 
-#: Merge.rc:936
+#: Merge.rc:939
 #, c-format
 msgid "Selected Moved:"
 msgstr ""
 
-#: Merge.rc:943
+#: Merge.rc:946
 #, c-format
 msgid "Word Difference:"
 msgstr ""
 
-#: Merge.rc:950
+#: Merge.rc:953
 #, c-format
 msgid "Selected Word Diff:"
 msgstr ""
 
-#: Merge.rc:957
-#: Merge.rc:1039
-#: Merge.rc:1068
-#: Merge.rc:1165
-#: Merge.rc:1393
+#: Merge.rc:960
+#: Merge.rc:1042
+#: Merge.rc:1071
+#: Merge.rc:1168
+#: Merge.rc:1396
 #, c-format
 msgid "Defaults"
 msgstr ""
 
-#: Merge.rc:963
-#: Merge.rc:1335
-#: Merge.rc:1541
+#: Merge.rc:966
+#: Merge.rc:1338
+#: Merge.rc:1544
 #, c-format
 msgid "Dialog"
 msgstr "Di\xE1logo"
 
-#: Merge.rc:973
-#: Merge.rc:1898
+#: Merge.rc:976
+#: Merge.rc:1901
 #, c-format
 msgid "System"
 msgstr ""
 
-#: Merge.rc:976
+#: Merge.rc:979
 #, c-format
 msgid "&Send deleted files to Recycle Bin"
 msgstr ""
 
-#: Merge.rc:978
+#: Merge.rc:981
 #, c-format
 msgid "Ign&ore time differences less than 3 seconds"
 msgstr ""
 
-#: Merge.rc:981
+#: Merge.rc:984
 #, c-format
 msgid "Integration"
 msgstr ""
 
-#: Merge.rc:982
+#: Merge.rc:985
 #, c-format
 msgid "&Add to explorer context menu"
 msgstr ""
 
-#: Merge.rc:984
+#: Merge.rc:987
 #, c-format
 msgid "E&nable advanced menu"
 msgstr ""
 
-#: Merge.rc:986
+#: Merge.rc:989
 #, c-format
 msgid "In&clude subfolders by default"
 msgstr ""
 
-#: Merge.rc:988
+#: Merge.rc:991
 #, c-format
 msgid "&External editor:"
 msgstr ""
 
-#: Merge.rc:991
+#: Merge.rc:994
 #, c-format
 msgid "&Filter folder:"
 msgstr ""
 
-#: Merge.rc:993
-#: Merge.rc:1405
-#: Merge.rc:1579
-#: Merge.rc:1583
-#: Merge.rc:1610
+#: Merge.rc:996
+#: Merge.rc:1408
+#: Merge.rc:1582
+#: Merge.rc:1586
+#: Merge.rc:1613
 #, c-format
 msgid "Browse..."
 msgstr ""
 
-#: Merge.rc:999
+#: Merge.rc:1002
 #, c-format
 msgid "Patch Generator"
 msgstr ""
 
-#: Merge.rc:1002
+#: Merge.rc:1005
 #, c-format
 msgid "File&1:"
 msgstr ""
 
-#: Merge.rc:1006
+#: Merge.rc:1009
 #, c-format
 msgid "File&2:"
 msgstr ""
 
-#: Merge.rc:1009
+#: Merge.rc:1012
 #, c-format
 msgid "Br&owse..."
 msgstr ""
 
-#: Merge.rc:1010
+#: Merge.rc:1013
 #, c-format
 msgid "&Swap"
 msgstr ""
 
-#: Merge.rc:1011
+#: Merge.rc:1014
 #, c-format
 msgid "&Append to existing file"
 msgstr ""
 
-#: Merge.rc:1013
+#: Merge.rc:1016
 #, c-format
 msgid "&Result:"
 msgstr ""
 
-#: Merge.rc:1017
+#: Merge.rc:1020
 #, c-format
 msgid "&Format"
 msgstr ""
 
-#: Merge.rc:1018
+#: Merge.rc:1021
 #, c-format
 msgid "St&yle:"
 msgstr ""
 
-#: Merge.rc:1021
+#: Merge.rc:1024
 #, c-format
 msgid "&Context:"
 msgstr ""
 
-#: Merge.rc:1024
+#: Merge.rc:1027
 #, c-format
 msgid "W&hitespaces"
 msgstr ""
 
-#: Merge.rc:1025
+#: Merge.rc:1028
 #, c-format
 msgid "Com&pare"
 msgstr ""
 
-#: Merge.rc:1027
+#: Merge.rc:1030
 #, c-format
 msgid "I&gnore changes"
 msgstr ""
 
-#: Merge.rc:1029
+#: Merge.rc:1032
 #, c-format
 msgid "Ig&nore all"
 msgstr ""
 
-#: Merge.rc:1031
+#: Merge.rc:1034
 #, c-format
 msgid "Ignor&e blank lines"
 msgstr ""
 
-#: Merge.rc:1033
+#: Merge.rc:1036
 #, c-format
 msgid "Case sensi&tive"
 msgstr ""
 
-#: Merge.rc:1035
+#: Merge.rc:1038
 #, c-format
 msgid "Inclu&de command line"
 msgstr ""
 
-#: Merge.rc:1037
+#: Merge.rc:1040
 #, c-format
 msgid "Open to e&xternal editor"
 msgstr ""
 
-#: Merge.rc:1059
+#: Merge.rc:1062
 #, c-format
 msgid "Display Columns"
 msgstr ""
 
-#: Merge.rc:1065
+#: Merge.rc:1068
 #, c-format
 msgid "Move &Up"
 msgstr ""
 
-#: Merge.rc:1066
+#: Merge.rc:1069
 #, c-format
 msgid "Move &Down"
 msgstr ""
 
-#: Merge.rc:1076
+#: Merge.rc:1079
 #, c-format
 msgid "Select Unpacker"
 msgstr ""
 
-#: Merge.rc:1081
+#: Merge.rc:1084
 #, c-format
 msgid "File unpacker:"
 msgstr ""
 
-#: Merge.rc:1084
+#: Merge.rc:1087
 #, c-format
 msgid "Display all unpackers, don't check the extension"
 msgstr ""
 
-#: Merge.rc:1087
+#: Merge.rc:1090
 #, c-format
 msgid "Extensions list:"
 msgstr ""
 
-#: Merge.rc:1088
+#: Merge.rc:1091
 #, c-format
 msgid "Description:"
 msgstr ""
 
-#: Merge.rc:1099
+#: Merge.rc:1102
 #, c-format
 msgid " Folder Compare Progress"
 msgstr ""
 
-#: Merge.rc:1102
-#: Merge.rc:1845
+#: Merge.rc:1105
+#: Merge.rc:1848
 #, c-format
 msgid "Stop"
 msgstr ""
 
-#: Merge.rc:1107
+#: Merge.rc:1110
 #, c-format
 msgid "Comparing items..."
 msgstr ""
 
-#: Merge.rc:1108
+#: Merge.rc:1111
 #, c-format
 msgid "Items compared:"
 msgstr ""
 
-#: Merge.rc:1109
+#: Merge.rc:1112
 #, c-format
 msgid "Items total:"
 msgstr ""
 
-#: Merge.rc:1115
+#: Merge.rc:1118
 #, c-format
 msgid "Go To"
 msgstr ""
 
-#: Merge.rc:1118
+#: Merge.rc:1121
 #, c-format
 msgid "G&oto:"
 msgstr ""
 
-#: Merge.rc:1120
+#: Merge.rc:1123
 #, c-format
 msgid "File"
 msgstr ""
 
-#: Merge.rc:1125
+#: Merge.rc:1128
 #, c-format
 msgid "Goto what"
 msgstr ""
 
-#: Merge.rc:1126
+#: Merge.rc:1129
 #, c-format
 msgid "Li&ne"
 msgstr ""
 
-#: Merge.rc:1128
+#: Merge.rc:1131
 #, c-format
 msgid "&Difference"
 msgstr ""
 
-#: Merge.rc:1130
+#: Merge.rc:1133
 #, c-format
 msgid "&Go To"
 msgstr ""
 
-#: Merge.rc:1136
-#: Merge.rc:1893
+#: Merge.rc:1139
+#: Merge.rc:1896
 #, c-format
 msgid "Compare"
 msgstr ""
 
-#: Merge.rc:1139
+#: Merge.rc:1142
 #, c-format
 msgid "Whitespace"
 msgstr ""
 
-#: Merge.rc:1140
+#: Merge.rc:1143
 #, c-format
 msgid "&Compare"
 msgstr "Comparar e&spa\xE7os em branco"
 
-#: Merge.rc:1142
+#: Merge.rc:1145
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignorar mofica\xE7\xF5es nos espa\xE7os em branco"
 
-#: Merge.rc:1144
+#: Merge.rc:1147
 #, c-format
 msgid "I&gnore all"
 msgstr "Ignora t&odos espa\xE7os em branco"
 
-#: Merge.rc:1146
+#: Merge.rc:1149
 #, c-format
 msgid "Ignore blan&k lines"
 msgstr "Ignorar linhas em bran&co"
 
-#: Merge.rc:1148
+#: Merge.rc:1151
 #, c-format
 msgid "Ignore &case"
 msgstr "Ignorar &ma\xEDsculas/min\xFAsculas"
 
-#: Merge.rc:1150
+#: Merge.rc:1153
 #, c-format
 msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
 msgstr ""
 
-#: Merge.rc:1153
+#: Merge.rc:1156
 #, c-format
 msgid "E&nable moved block detection"
 msgstr ""
 
-#: Merge.rc:1155
+#: Merge.rc:1158
 #, c-format
 msgid "&Match similar lines"
 msgstr ""
 
-#: Merge.rc:1157
+#: Merge.rc:1160
 #, c-format
 msgid "&File Compare method:"
 msgstr ""
 
-#: Merge.rc:1160
+#: Merge.rc:1163
 #, c-format
 msgid "S&top after first difference"
 msgstr ""
 
-#: Merge.rc:1163
+#: Merge.rc:1166
 #, c-format
 msgid "Filter Comments"
 msgstr ""
 
-#: Merge.rc:1170
-#: Merge.rc:1894
+#: Merge.rc:1173
+#: Merge.rc:1897
 #, c-format
 msgid "Editor"
 msgstr ""
 
-#: Merge.rc:1173
+#: Merge.rc:1176
 #, c-format
 msgid "&Highlight syntax"
 msgstr "Destacar sintaxe"
 
-#: Merge.rc:1175
+#: Merge.rc:1178
 #, c-format
 msgid "&Automatic rescan"
 msgstr "&Atualiza\xE7\xE3o autom\xE1tica"
 
-#: Merge.rc:1177
+#: Merge.rc:1180
 #, c-format
 msgid "&Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1179
+#: Merge.rc:1182
 #, c-format
 msgid "Tabs"
 msgstr "Tabula\xE7\xE3o"
 
-#: Merge.rc:1180
+#: Merge.rc:1183
 #, c-format
 msgid "&Tab size:"
 msgstr "Tama&nho da tabula\xE7\xE3o:"
 
-#: Merge.rc:1183
+#: Merge.rc:1186
 #, c-format
 msgid "&Insert Tabs"
 msgstr ""
 
-#: Merge.rc:1185
+#: Merge.rc:1188
 #, c-format
 msgid "Insert &Spaces"
 msgstr ""
 
-#: Merge.rc:1187
+#: Merge.rc:1190
 #, c-format
 msgid "Line Difference Coloring"
 msgstr ""
 
-#: Merge.rc:1189
+#: Merge.rc:1192
 #, c-format
 msgid "View line differences"
 msgstr ""
 
-#: Merge.rc:1191
+#: Merge.rc:1194
 #, c-format
 msgid "&Character level"
 msgstr ""
 
-#: Merge.rc:1193
+#: Merge.rc:1196
 #, c-format
 msgid "&Word-level:"
 msgstr ""
 
-#: Merge.rc:1208
+#: Merge.rc:1211
 #, c-format
 msgid "Filefilters"
 msgstr ""
 
-#: Merge.rc:1214
+#: Merge.rc:1217
 #, c-format
 msgid "Test"
 msgstr ""
 
-#: Merge.rc:1215
+#: Merge.rc:1218
 #, c-format
 msgid "Install..."
 msgstr ""
 
-#: Merge.rc:1216
+#: Merge.rc:1219
 #, c-format
 msgid "New..."
 msgstr ""
 
-#: Merge.rc:1217
+#: Merge.rc:1220
 #, c-format
 msgid "Edit..."
 msgstr ""
 
-#: Merge.rc:1218
+#: Merge.rc:1221
 #, c-format
 msgid "Delete..."
 msgstr ""
 
-#: Merge.rc:1224
+#: Merge.rc:1227
 #, c-format
 msgid "Save modified files?"
 msgstr ""
 
-#: Merge.rc:1227
+#: Merge.rc:1230
 #, c-format
 msgid "Left side file"
 msgstr ""
 
-#: Merge.rc:1230
+#: Merge.rc:1233
 #, c-format
 msgid "&Save changes"
 msgstr ""
 
-#: Merge.rc:1232
+#: Merge.rc:1235
 #, c-format
 msgid "&Discard changes"
 msgstr ""
 
-#: Merge.rc:1234
+#: Merge.rc:1237
 #, c-format
 msgid "Right side file"
 msgstr ""
 
-#: Merge.rc:1237
+#: Merge.rc:1240
 #, c-format
 msgid "S&ave changes"
 msgstr ""
 
-#: Merge.rc:1239
+#: Merge.rc:1242
 #, c-format
 msgid "Dis&card changes"
 msgstr ""
 
-#: Merge.rc:1241
+#: Merge.rc:1244
 #, c-format
 msgid "Discard All"
 msgstr ""
 
-#: Merge.rc:1248
-#: Merge.rc:1496
-#: Merge.rc:1900
+#: Merge.rc:1251
+#: Merge.rc:1499
+#: Merge.rc:1903
 #, c-format
 msgid "Codepage"
 msgstr ""
 
-#: Merge.rc:1251
+#: Merge.rc:1254
 #, c-format
 msgid "Default Codepage"
 msgstr ""
 
-#: Merge.rc:1252
+#: Merge.rc:1255
 #, c-format
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr ""
 
-#: Merge.rc:1254
+#: Merge.rc:1257
 #, c-format
 msgid ""
 "Detect codepage info for these files : .html, .rc, .xml \n"
 "need to restart session"
 msgstr ""
 
-#: Merge.rc:1257
+#: Merge.rc:1260
 #, c-format
 msgid "System codepage"
 msgstr ""
 
-#: Merge.rc:1259
+#: Merge.rc:1262
 #, c-format
 msgid "According to WinMerge User Interface"
 msgstr ""
 
-#: Merge.rc:1261
+#: Merge.rc:1264
 #, c-format
 msgid "Custom codepage :"
 msgstr ""
 
-#: Merge.rc:1269
+#: Merge.rc:1272
 #, c-format
 msgid "WinMerge - Archive support disabled"
 msgstr ""
 
-#: Merge.rc:1272
+#: Merge.rc:1275
 #, c-format
 msgid "Unable to detect 7-Zip version (not installed?)"
 msgstr ""
 
-#: Merge.rc:1275
+#: Merge.rc:1278
 #, c-format
 msgid ""
 "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
 "essential components to be copied to the program directory for standalone operation."
 msgstr ""
 
-#: Merge.rc:1277
+#: Merge.rc:1280
 #, c-format
 msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
 msgstr ""
 
-#: Merge.rc:1279
+#: Merge.rc:1282
 #, c-format
 msgid ""
 "Please use the version of 7-Zip recommended below until interface plugins for later\n"
 "versions become available."
 msgstr ""
 
-#: Merge.rc:1281
+#: Merge.rc:1284
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: Merge.rc:1283
+#: Merge.rc:1286
 #, c-format
 msgid ""
 "Plugin required\n"
 "(dllbuild %04u)"
 msgstr ""
 
-#: Merge.rc:1285
+#: Merge.rc:1288
 #, c-format
 msgid "Recommended version of 7-Zip:"
 msgstr ""
 
-#: Merge.rc:1288
 #: Merge.rc:1291
+#: Merge.rc:1294
 #, c-format
 msgid "present"
 msgstr ""
 
-#: Merge.rc:1289
+#: Merge.rc:1292
 #, c-format
 msgid "Merge7z000U.dll"
 msgstr ""
 
-#: Merge.rc:1292
+#: Merge.rc:1295
 #, c-format
 msgid "7-Zip software installed on your computer:"
 msgstr ""
 
-#: Merge.rc:1294
-#: Merge.rc:1299
+#: Merge.rc:1297
+#: Merge.rc:1302
 #, c-format
 msgid "none"
 msgstr ""
 
-#: Merge.rc:1296
+#: Merge.rc:1299
 #, c-format
 msgid "missing"
 msgstr ""
 
-#: Merge.rc:1297
+#: Merge.rc:1300
 #, c-format
 msgid "7-Zip components for standalone operation:"
 msgstr ""
 
-#: Merge.rc:1301
+#: Merge.rc:1304
 #, c-format
 msgid "outdated"
 msgstr ""
 
-#: Merge.rc:1302
+#: Merge.rc:1305
 #, c-format
 msgid "Plugins on path:"
 msgstr ""
 
-#: Merge.rc:1303
+#: Merge.rc:1306
 #, c-format
 msgid ""
 "Don't display this &message again.\n"
 "(You can always recall this message from help menu.)"
 msgstr ""
 
-#: Merge.rc:1307
+#: Merge.rc:1310
 #, c-format
 msgid "Plugin Download"
 msgstr ""
 
-#: Merge.rc:1316
+#: Merge.rc:1319
 #, c-format
 msgid "Options"
 msgstr ""
 
-#: Merge.rc:1327
+#: Merge.rc:1330
 #, c-format
 msgid " Categories"
 msgstr ""
 
-#: Merge.rc:1329
+#: Merge.rc:1332
 #, c-format
 msgid "Import..."
 msgstr ""
 
-#: Merge.rc:1330
+#: Merge.rc:1333
 #, c-format
 msgid "Export..."
 msgstr ""
 
-#: Merge.rc:1338
+#: Merge.rc:1341
 #, c-format
 msgid "Keywords:"
 msgstr ""
 
-#: Merge.rc:1339
+#: Merge.rc:1342
 #, c-format
 msgid "Function names:"
 msgstr ""
 
-#: Merge.rc:1340
+#: Merge.rc:1343
 #, c-format
 msgid "Comments:"
 msgstr ""
 
-#: Merge.rc:1341
+#: Merge.rc:1344
 #, c-format
 msgid "Numbers:"
 msgstr ""
 
-#: Merge.rc:1342
+#: Merge.rc:1345
 #, c-format
 msgid "Operators:"
 msgstr ""
 
-#: Merge.rc:1343
+#: Merge.rc:1346
 #, c-format
 msgid "Strings:"
 msgstr ""
 
-#: Merge.rc:1344
+#: Merge.rc:1347
 #, c-format
 msgid "Preprocessor:"
 msgstr ""
 
-#: Merge.rc:1345
+#: Merge.rc:1348
 #, c-format
 msgid "User 1:"
 msgstr ""
 
-#: Merge.rc:1346
+#: Merge.rc:1349
 #, c-format
 msgid "User 2:"
 msgstr ""
 
-#: Merge.rc:1351
-#: Merge.rc:1356
-#: Merge.rc:1361
-#: Merge.rc:1366
-#: Merge.rc:1371
-#: Merge.rc:1376
-#: Merge.rc:1381
-#: Merge.rc:1386
-#: Merge.rc:1391
+#: Merge.rc:1354
+#: Merge.rc:1359
+#: Merge.rc:1364
+#: Merge.rc:1369
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
 #, c-format
 msgid "Bold"
 msgstr ""
 
-#: Merge.rc:1399
+#: Merge.rc:1402
 #, c-format
 msgid "Folder Compare Report"
 msgstr "Directory Compare Report"
 
-#: Merge.rc:1402
+#: Merge.rc:1405
 #, c-format
 msgid "Report &File:"
 msgstr ""
 
-#: Merge.rc:1406
+#: Merge.rc:1409
 #, c-format
 msgid "&Style:"
 msgstr ""
 
-#: Merge.rc:1409
+#: Merge.rc:1412
 #, c-format
 msgid "&Copy to Clipboard"
 msgstr ""
 
-#: Merge.rc:1417
+#: Merge.rc:1420
 #, c-format
 msgid "Shared or Private Filter"
 msgstr ""
 
-#: Merge.rc:1420
+#: Merge.rc:1423
 #, c-format
 msgid "Which type of filter do you want to create?"
 msgstr ""
 
-#: Merge.rc:1422
+#: Merge.rc:1425
 #, c-format
 msgid "Shared Filter (for all users on this machine)"
 msgstr ""
 
-#: Merge.rc:1424
+#: Merge.rc:1427
 #, c-format
 msgid "Private Filter (only for current user)"
 msgstr ""
 
-#: Merge.rc:1432
-#: Merge.rc:1901
+#: Merge.rc:1435
+#: Merge.rc:1904
 #, c-format
 msgid "Archive Support"
 msgstr ""
 
-#: Merge.rc:1435
+#: Merge.rc:1438
 #, c-format
 msgid "Archive support requires 7-Zip plugin installed:"
 msgstr ""
 
-#: Merge.rc:1437
+#: Merge.rc:1440
 #, c-format
 msgid "Download 7-zip Plugin"
 msgstr ""
 
-#: Merge.rc:1438
+#: Merge.rc:1441
 #, c-format
 msgid "&Enable archive file support"
 msgstr ""
 
-#: Merge.rc:1440
+#: Merge.rc:1443
 #, c-format
 msgid "&Use stand-alone 7-Zip if available"
 msgstr ""
 
-#: Merge.rc:1443
+#: Merge.rc:1446
 #, c-format
 msgid "U&se local 7-Zip from WinMerge folder"
 msgstr ""
 
-#: Merge.rc:1445
+#: Merge.rc:1448
 #, c-format
 msgid "&Detect archive type from file signature"
 msgstr ""
 
-#: Merge.rc:1453
+#: Merge.rc:1456
 #, c-format
 msgid "Compare Statistics"
 msgstr ""
 
-#: Merge.rc:1456
+#: Merge.rc:1459
 #, c-format
 msgid "Folders:"
 msgstr ""
 
-#: Merge.rc:1457
+#: Merge.rc:1460
 #, c-format
 msgid "Files:"
 msgstr ""
 
-#: Merge.rc:1458
-#: Merge.rc:2268
+#: Merge.rc:1461
+#: Merge.rc:2271
 #, c-format
 msgid "Different"
 msgstr ""
 
-#: Merge.rc:1459
+#: Merge.rc:1462
 #, c-format
 msgid "Text:"
 msgstr ""
 
-#: Merge.rc:1462
-#: Merge.rc:1481
+#: Merge.rc:1465
+#: Merge.rc:1484
 #, c-format
 msgid "Binary:"
 msgstr ""
 
-#: Merge.rc:1465
+#: Merge.rc:1468
 #, c-format
 msgid "Unique"
 msgstr ""
 
-#: Merge.rc:1466
+#: Merge.rc:1469
 #, c-format
 msgid "Left:"
 msgstr ""
 
-#: Merge.rc:1471
+#: Merge.rc:1474
 #, c-format
 msgid "Right:"
 msgstr ""
 
-#: Merge.rc:1476
-#: Merge.rc:2263
+#: Merge.rc:1479
+#: Merge.rc:2266
 #, c-format
 msgid "Identical"
 msgstr "Id\xEAnticos"
 
-#: Merge.rc:1485
+#: Merge.rc:1488
 #, c-format
 msgid "Total:"
 msgstr ""
 
-#: Merge.rc:1490
+#: Merge.rc:1493
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: Merge.rc:1499
+#: Merge.rc:1502
 #, c-format
 msgid "Affects"
 msgstr ""
 
-#: Merge.rc:1502
 #: Merge.rc:1505
+#: Merge.rc:1508
 #, c-format
 msgid "(Affects)"
 msgstr ""
 
-#: Merge.rc:1506
+#: Merge.rc:1509
 #, c-format
 msgid "Select Codepage for"
 msgstr ""
 
-#: Merge.rc:1507
+#: Merge.rc:1510
 #, c-format
 msgid "&File Loading:"
 msgstr ""
 
-#: Merge.rc:1509
 #: Merge.rc:1512
+#: Merge.rc:1515
 #, c-format
 msgid "..."
 msgstr ""
 
-#: Merge.rc:1510
+#: Merge.rc:1513
 #, c-format
 msgid "File &Saving:"
 msgstr ""
 
-#: Merge.rc:1513
+#: Merge.rc:1516
 #, c-format
 msgid "&Use same codepage for both"
 msgstr ""
 
-#: Merge.rc:1516
+#: Merge.rc:1519
 #, c-format
 msgid "&Apply"
 msgstr ""
 
-#: Merge.rc:1517
-#: Merge.rc:1867
+#: Merge.rc:1520
+#: Merge.rc:1870
 #, c-format
 msgid "&Cancel"
 msgstr ""
 
-#: Merge.rc:1522
+#: Merge.rc:1525
 #, c-format
 msgid "Test Filter"
 msgstr ""
 
-#: Merge.rc:1525
+#: Merge.rc:1528
 #, c-format
 msgid "Testing filter ..."
 msgstr ""
 
-#: Merge.rc:1527
+#: Merge.rc:1530
 #, c-format
 msgid "&Enter text to test:"
 msgstr ""
 
-#: Merge.rc:1529
+#: Merge.rc:1532
 #, c-format
 msgid "&Folder Name"
 msgstr ""
 
-#: Merge.rc:1531
+#: Merge.rc:1534
 #, c-format
 msgid "Result:"
 msgstr ""
 
-#: Merge.rc:1535
+#: Merge.rc:1538
 #, c-format
 msgid "&Test"
 msgstr ""
 
-#: Merge.rc:1536
+#: Merge.rc:1539
 #, c-format
 msgid "&Close"
 msgstr ""
 
-#: Merge.rc:1544
+#: Merge.rc:1547
 #, c-format
 msgid "&Use customized text colors"
 msgstr ""
 
-#: Merge.rc:1547
+#: Merge.rc:1550
 #, c-format
 msgid "Custom text colors"
 msgstr ""
 
-#: Merge.rc:1549
+#: Merge.rc:1552
 #, c-format
 msgid "Whitespace:"
 msgstr ""
 
-#: Merge.rc:1550
+#: Merge.rc:1553
 #, c-format
 msgid "Regular text:"
 msgstr ""
 
-#: Merge.rc:1551
+#: Merge.rc:1554
 #, c-format
 msgid "Selection:"
 msgstr ""
 
-#: Merge.rc:1574
+#: Merge.rc:1577
 #, c-format
 msgid "Paths"
 msgstr ""
 
-#: Merge.rc:1580
+#: Merge.rc:1583
 #, c-format
 msgid "R&ead-only"
 msgstr ""
 
-#: Merge.rc:1584
+#: Merge.rc:1587
 #, c-format
 msgid "Re&ad-only"
 msgstr ""
 
-#: Merge.rc:1590
+#: Merge.rc:1593
 #, c-format
 msgid "Open..."
 msgstr ""
 
-#: Merge.rc:1591
+#: Merge.rc:1594
 #, c-format
 msgid "Save..."
 msgstr ""
 
-#: Merge.rc:1596
-#: Merge.rc:1902
+#: Merge.rc:1599
+#: Merge.rc:1905
 #, c-format
 msgid "Backup Files"
 msgstr ""
 
-#: Merge.rc:1599
+#: Merge.rc:1602
 #, c-format
 msgid "Create backup files in:"
 msgstr ""
 
-#: Merge.rc:1604
+#: Merge.rc:1607
 #, c-format
 msgid "Create backup files into:"
 msgstr ""
 
-#: Merge.rc:1605
+#: Merge.rc:1608
 #, c-format
 msgid "&Original file's folder"
 msgstr ""
 
-#: Merge.rc:1607
+#: Merge.rc:1610
 #, c-format
 msgid "&Global backup folder:"
 msgstr ""
 
-#: Merge.rc:1611
+#: Merge.rc:1614
 #, c-format
 msgid "Backup filename:"
 msgstr ""
 
-#: Merge.rc:1612
+#: Merge.rc:1615
 #, c-format
 msgid "&Append .bak -extension"
 msgstr ""
 
-#: Merge.rc:1614
+#: Merge.rc:1617
 #, c-format
 msgid "A&ppend timestamp"
 msgstr ""
 
-#: Merge.rc:1621
+#: Merge.rc:1624
 #, c-format
 msgid "Confirm Copy"
 msgstr ""
 
-#: Merge.rc:1625
+#: Merge.rc:1628
 #, c-format
 msgid "Are you sure you want to copy XXX items?"
 msgstr ""
 
-#: Merge.rc:1627
+#: Merge.rc:1630
 #, c-format
 msgid "From left"
 msgstr ""
 
-#: Merge.rc:1630
+#: Merge.rc:1633
 #, c-format
 msgid "To right"
 msgstr ""
 
-#: Merge.rc:1633
+#: Merge.rc:1636
 #, c-format
 msgid "Yes"
 msgstr ""
 
-#: Merge.rc:1634
+#: Merge.rc:1637
 #, c-format
 msgid "No"
 msgstr ""
 
 #. StringFileInfo.Block
-#: Merge.rc:1659
+#: Merge.rc:1662
 #, c-format
 msgid "040904e4"
 msgstr "041604e4"
 
 #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!
-#: Merge.rc:1661
+#: Merge.rc:1664
 #, c-format
 msgid "English translation by developers"
 msgstr "Translated by Wender Cris de Souza Firmino & Noreuzis"
 
 #. VarFileInfo.Translation
-#: Merge.rc:1674
+#: Merge.rc:1677
 #, c-format
 msgid "0x409, 1252"
 msgstr "0x416, 1252"
 
-#: Merge.rc:1689
+#: Merge.rc:1692
 #, c-format
 msgid "Ready"
 msgstr "Pronto"
 
-#: Merge.rc:1695
+#: Merge.rc:1698
 #, c-format
 msgid "EXT"
 msgstr ""
 
-#: Merge.rc:1696
+#: Merge.rc:1699
 #, c-format
 msgid "CAP"
 msgstr ""
 
-#: Merge.rc:1697
+#: Merge.rc:1700
 #, c-format
 msgid "NUM"
 msgstr ""
 
-#: Merge.rc:1698
+#: Merge.rc:1701
 #, c-format
 msgid "SCRL"
 msgstr ""
 
-#: Merge.rc:1699
+#: Merge.rc:1702
 #, c-format
 msgid "OVR"
 msgstr ""
 
-#: Merge.rc:1700
+#: Merge.rc:1703
 #, c-format
 msgid "REC"
 msgstr ""
 
-#: Merge.rc:1706
+#: Merge.rc:1709
 #, c-format
 msgid ""
 "Create empty documents\n"
 "New Documents (Ctrl+N)"
 msgstr ""
 
-#: Merge.rc:1707
+#: Merge.rc:1710
 #, c-format
 msgid ""
 "Open an existing document\n"
@@ -2608,7 +2615,7 @@
 "Abrir um documento existente\n"
 "Abrir"
 
-#: Merge.rc:1708
+#: Merge.rc:1711
 #, c-format
 msgid ""
 "Close the active document\n"
@@ -2617,7 +2624,7 @@
 "Fechar o documento ativo\n"
 "Fechar"
 
-#: Merge.rc:1709
+#: Merge.rc:1712
 #, c-format
 msgid ""
 "Save the active document\n"
@@ -2626,7 +2633,7 @@
 "Salvar o documento ativo\n"
 "Salvar"
 
-#: Merge.rc:1710
+#: Merge.rc:1713
 #, c-format
 msgid ""
 "Save the active document with a new name\n"
@@ -2635,7 +2642,7 @@
 "Salvar o documento ativo com um novo nome\n"
 "Salvar Como"
 
-#: Merge.rc:1711
+#: Merge.rc:1714
 #, c-format
 msgid ""
 "Change the printing options\n"
@@ -2644,7 +2651,7 @@
 "Alterar as configura\xE7\xF5es de impress\xE3o\n"
 "Configurar P\xE1gina"
 
-#: Merge.rc:1712
+#: Merge.rc:1715
 #, c-format
 msgid ""
 "Change the printer and printing options\n"
@@ -2653,7 +2660,7 @@
 "Alterar a impressora e as configura\xE7\xF5es de impress\xE3o\n"
 "Configurar impressora"
 
-#: Merge.rc:1713
+#: Merge.rc:1716
 #, c-format
 msgid ""
 "Print the active document\n"
@@ -2662,7 +2669,7 @@
 "Imprimir o documento ativo\n"
 "Imprimir"
 
-#: Merge.rc:1714
+#: Merge.rc:1717
 #, c-format
 msgid ""
 "Display full pages\n"
@@ -2671,51 +2678,51 @@
 "Visualizar impress\xE3o\n"
 "Visualizar Impress\xE3o"
 
-#: Merge.rc:1719
+#: Merge.rc:1722
 #, c-format
 msgid "Make all hidden items visible again"
 msgstr ""
 
-#: Merge.rc:1725
+#: Merge.rc:1728
 #, c-format
 msgid ""
 "Open project file\n"
 "Project file (Ctrl+J)"
 msgstr ""
 
-#: Merge.rc:1726
+#: Merge.rc:1729
 #, c-format
 msgid "Unknown error attempting to open project file"
 msgstr ""
 
-#: Merge.rc:1727
+#: Merge.rc:1730
 #, c-format
 msgid "Unknown error attempting to save project file"
 msgstr ""
 
-#: Merge.rc:1728
+#: Merge.rc:1731
 #, c-format
 msgid "Project File"
 msgstr ""
 
-#: Merge.rc:1729
+#: Merge.rc:1732
 #, c-format
 msgid "Project file successfully loaded."
 msgstr ""
 
-#: Merge.rc:1730
+#: Merge.rc:1733
 #, c-format
 msgid "Project file successfully saved."
 msgstr ""
 
-#: Merge.rc:1731
+#: Merge.rc:1734
 #, c-format
 msgid ""
 "Save current paths and options to project file\n"
 "Save Project File"
 msgstr ""
 
-#: Merge.rc:1736
+#: Merge.rc:1739
 #, c-format
 msgid ""
 "Display program information, version number and copyright\n"
@@ -2724,7 +2731,7 @@
 "Exibe informa\xE7\xF5es do programa, n\xFAmero da Vers\xE3o e Copyright\n"
 "Sobre"
 
-#: Merge.rc:1737
+#: Merge.rc:1740
 #, c-format
 msgid ""
 "Quit the application; prompts to save documents\n"
@@ -2733,9 +2740,6 @@
 "Sair do programa; pede para salvar documentos\n"
 "Sair"
 
-#: Merge.rc:1743
-#: Merge.rc:1744
-#: Merge.rc:1745
 #: Merge.rc:1746
 #: Merge.rc:1747
 #: Merge.rc:1748
@@ -2749,11 +2753,14 @@
 #: Merge.rc:1756
 #: Merge.rc:1757
 #: Merge.rc:1758
+#: Merge.rc:1759
+#: Merge.rc:1760
+#: Merge.rc:1761
 #, c-format
 msgid "Open this document"
 msgstr "Abrir este documento"
 
-#: Merge.rc:1763
+#: Merge.rc:1766
 #, c-format
 msgid ""
 "Switch to the next window pane\n"
@@ -2762,7 +2769,7 @@
 "Ativa o pr\xF3ximo painel\n"
 "Pr\xF3ximo Painel"
 
-#: Merge.rc:1764
+#: Merge.rc:1767
 #, c-format
 msgid ""
 "Switch back to the previous window pane\n"
@@ -2771,7 +2778,7 @@
 "Ativa o painel anterior\n"
 "Painel anterior"
 
-#: Merge.rc:1770
+#: Merge.rc:1773
 #, c-format
 msgid ""
 "Open another window for the active document\n"
@@ -2780,7 +2787,7 @@
 "Abre outra janela para o documento ativo\n"
 "Nova Janela"
 
-#: Merge.rc:1771
+#: Merge.rc:1774
 #, c-format
 msgid ""
 "Arrange icons at the bottom of the window\n"
@@ -2789,7 +2796,7 @@
 "Organiza os \xEDcones no fundo da janela\n"
 "Organiza os \xEDcones"
 
-#: Merge.rc:1772
+#: Merge.rc:1775
 #, c-format
 msgid ""
 "Arrange windows so they overlap\n"
@@ -2798,7 +2805,7 @@
 "Organiza as janelas de modo que elas se sobreponham\n"
 "Organiza em Cascata"
 
-#: Merge.rc:1773
+#: Merge.rc:1776
 #, fuzzy, c-format
 msgid ""
 "Arrange windows as non-overlapping tiles horizontally\n"
@@ -2807,7 +2814,7 @@
 "Organiza as janelas de modo que elas n\xE3o se sobreponham\n"
 "Organiza Horizontalmente"
 
-#: Merge.rc:1774
+#: Merge.rc:1777
 #, fuzzy, c-format
 msgid ""
 "Arrange windows as non-overlapping tiles vertically\n"
@@ -2816,7 +2823,7 @@
 "Organiza as janelas de modo que elas n\xE3o se sobreponham\n"
 "Organiza Verticalmente"
 
-#: Merge.rc:1775
+#: Merge.rc:1778
 #, c-format
 msgid ""
 "Split the active window into panes\n"
@@ -2825,7 +2832,7 @@
 "Divide a janela ativa em pain\xE9is\n"
 "Divide"
 
-#: Merge.rc:1781
+#: Merge.rc:1784
 #, c-format
 msgid ""
 "Erase the selection\n"
@@ -2834,7 +2841,7 @@
 "Apaga o texto selecionado\n"
 "Apaga"
 
-#: Merge.rc:1782
+#: Merge.rc:1785
 #, c-format
 msgid ""
 "Erase everything\n"
@@ -2843,7 +2850,7 @@
 "Apaga tudo\n"
 "Apaga tudo"
 
-#: Merge.rc:1783
+#: Merge.rc:1786
 #, c-format
 msgid ""
 "Copy the selection and put it on the Clipboard\n"
@@ -2852,7 +2859,7 @@
 "Copia o texto selecionado e p\xF5e na \xE1rea de Transfer\xEAncia\n"
 "Copia"
 
-#: Merge.rc:1784
+#: Merge.rc:1787
 #, c-format
 msgid ""
 "Cut the selection and put it on the Clipboard\n"
@@ -2861,7 +2868,7 @@
 "Recorta a sele\xE7\xE3o e p\xF5e na \xE1rea de Transfer\xEAncia\n"
 "Recorta"
 
-#: Merge.rc:1785
+#: Merge.rc:1788
 #, c-format
 msgid ""
 "Find the specified text\n"
@@ -2870,7 +2877,7 @@
 "Procura o texto especificado\n"
 "Procura"
 
-#: Merge.rc:1786
+#: Merge.rc:1789
 #, c-format
 msgid ""
 "Insert Clipboard contents\n"
@@ -2879,7 +2886,7 @@
 "Insere conte\xFAdo da \xE1rea de Transfer\xEAncia\n"
 "Cola"
 
-#: Merge.rc:1787
+#: Merge.rc:1790
 #, c-format
 msgid ""
 "Repeat the last action\n"
@@ -2888,7 +2895,7 @@
 "Repete a \xFAltima a\xE7\xE3o\n"
 "Repetir"
 
-#: Merge.rc:1788
+#: Merge.rc:1791
 #, c-format
 msgid ""
 "Replace specific text with different text\n"
@@ -2897,7 +2904,7 @@
 "Substitui o texto especificado por outro\n"
 "Substitui"
 
-#: Merge.rc:1789
+#: Merge.rc:1792
 #, c-format
 msgid ""
 "Select the entire document\n"
@@ -2906,7 +2913,7 @@
 "Seleciona o documento inteiro\n"
 "Seleciona Tudo"
 
-#: Merge.rc:1790
+#: Merge.rc:1793
 #, c-format
 msgid ""
 "Undo the last action\n"
@@ -2915,7 +2922,7 @@
 "Desfaz a \xFAltima a\xE7\xE3o\n"
 "Desfaz"
 
-#: Merge.rc:1791
+#: Merge.rc:1794
 #, c-format
 msgid ""
 "Redo the previously undone action\n"
@@ -2924,7 +2931,7 @@
 "Refaz a \xFAltima a\xE7\xE3o desfeita\n"
 "Refaz"
 
-#: Merge.rc:1797
+#: Merge.rc:1800
 #, c-format
 msgid ""
 "Show or hide the toolbar\n"
@@ -2933,7 +2940,7 @@
 "Exibe ou esconde a barra de ferramentas\n"
 "Chavea Barra de Ferramentas"
 
-#: Merge.rc:1798
+#: Merge.rc:1801
 #, c-format
 msgid ""
 "Show or hide the status bar\n"
@@ -2942,69 +2949,69 @@
 "Exibe ou esconde a barra de status\n"
 "Chavea Barra de Status"
 
-#: Merge.rc:1799
+#: Merge.rc:1802
 #, c-format
 msgid ""
 "Show or hide the tab bar\n"
 "Toggle TabBar"
 msgstr ""
 
-#: Merge.rc:1800
+#: Merge.rc:1803
 #, c-format
 msgid "Automatically resize panes\nLock Panes"
 msgstr ""
 
-#: Merge.rc:1806
+#: Merge.rc:1809
 #, c-format
 msgid "Change the window size"
 msgstr "Altera o tamanho da janela"
 
-#: Merge.rc:1807
+#: Merge.rc:1810
 #, c-format
 msgid "Change the window position"
 msgstr "Altera a posi\xE7\xE3o da janela"
 
-#: Merge.rc:1808
+#: Merge.rc:1811
 #, c-format
 msgid "Reduce the window to an icon"
 msgstr "Reduz a janela a um \xEDcone"
 
-#: Merge.rc:1809
+#: Merge.rc:1812
 #, c-format
 msgid "Enlarge the window to full size"
 msgstr "Aumenta o tamnho da janela ao m\xE1ximo"
 
-#: Merge.rc:1810
+#: Merge.rc:1813
 #, c-format
 msgid "Switch to the next document window"
 msgstr "Ativa a pr\xF3xima janela"
 
-#: Merge.rc:1811
+#: Merge.rc:1814
 #, c-format
 msgid "Switch to the previous document window"
 msgstr "Ativa a janela anterior"
 
-#: Merge.rc:1812
+#: Merge.rc:1815
 #, c-format
 msgid "Close the active window and prompts to save the documents"
 msgstr "Fecha a janela ativa e pede para salvar os documentos"
 
-#: Merge.rc:1817
+#: Merge.rc:1820
 #, c-format
 msgid "Restore the window to normal size"
 msgstr "Restaurar o tamanho normal da janela"
 
-#: Merge.rc:1818
+#: Merge.rc:1821
 #, c-format
 msgid "Activate Task List"
 msgstr "Ativar Lista de Tarefas"
 
-#: Merge.rc:1819
+#: Merge.rc:1822
 #, c-format
 msgid "Activate this window"
 msgstr "Ativar esta janela"
 
-#: Merge.rc:1825
+#: Merge.rc:1828
 #, c-format
 msgid ""
 "Close print preview mode\n"
@@ -3013,7 +3020,7 @@
 "Fechar a visualiza\xE7\xE3o de impress\xE3o\n"
 "Cancelar Preview"
 
-#: Merge.rc:1832
+#: Merge.rc:1835
 #, c-format
 msgid ""
 "\n"
@@ -3025,175 +3032,175 @@
 "WinMerge Document"
 msgstr ""
 
-#: Merge.rc:1839
+#: Merge.rc:1842
 #, c-format
 msgid "Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1846
+#: Merge.rc:1849
 #, c-format
 msgid "Press any key"
 msgstr ""
 
-#: Merge.rc:1852
-#: Merge.rc:1853
+#: Merge.rc:1855
+#: Merge.rc:1856
 #, c-format
 msgid "Right click on the path to copy"
 msgstr ""
 
-#: Merge.rc:1859
+#: Merge.rc:1862
 #, c-format
 msgid ""
 "Developers:\n"
 "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
 msgstr ""
 
-#: Merge.rc:1860
+#: Merge.rc:1863
 #, c-format
 msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
 msgstr ""
 
-#: Merge.rc:1866
+#: Merge.rc:1869
 #, c-format
 msgid "&Ok"
 msgstr ""
 
-#: Merge.rc:1868
+#: Merge.rc:1871
 #, c-format
 msgid "&Abort"
 msgstr ""
 
-#: Merge.rc:1869
+#: Merge.rc:1872
 #, c-format
 msgid "&Retry"
 msgstr ""
 
-#: Merge.rc:1870
+#: Merge.rc:1873
 #, c-format
 msgid "&Ignore"
 msgstr ""
 
-#: Merge.rc:1871
+#: Merge.rc:1874
 #, c-format
 msgid "Ignore &all"
 msgstr ""
 
-#: Merge.rc:1872
+#: Merge.rc:1875
 #, c-format
 msgid "&Yes"
 msgstr ""
 
-#: Merge.rc:1878
+#: Merge.rc:1881
 #, c-format
 msgid "Yes to &all"
 msgstr ""
 
-#: Merge.rc:1879
+#: Merge.rc:1882
 #, c-format
 msgid "&No"
 msgstr ""
 
-#: Merge.rc:1880
+#: Merge.rc:1883
 #, c-format
 msgid "No to a&ll"
 msgstr ""
 
-#: Merge.rc:1881
+#: Merge.rc:1884
 #, c-format
 msgid "&Continue"
 msgstr ""
 
-#: Merge.rc:1882
+#: Merge.rc:1885
 #, c-format
 msgid "&Skip"
 msgstr ""
 
-#: Merge.rc:1883
+#: Merge.rc:1886
 #, c-format
 msgid "Skip &all"
 msgstr ""
 
-#: Merge.rc:1885
+#: Merge.rc:1888
 #, c-format
 msgid "Don't display this &message again."
 msgstr ""
 
-#: Merge.rc:1886
+#: Merge.rc:1889
 #, c-format
 msgid "Don't ask this &question again."
 msgstr ""
 
-#: Merge.rc:1896
+#: Merge.rc:1899
 #, c-format
 msgid "Syntax colors"
 msgstr ""
 
-#: Merge.rc:1897
+#: Merge.rc:1900
 #, c-format
 msgid...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge: [4947] trunk

From: <ge...@us...> - 2008-01-22 22:52:19

Revision: 4947
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4947&view=rev
Author:   gerundt
Date:     2008-01-22 14:52:17 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
RFE: [ 1699883 ] Add "translation instructions" link to language dialog (now help menu)

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/Languages/English.pot
    trunk/Src/MainFrm.cpp
    trunk/Src/MainFrm.h
    trunk/Src/Merge.rc
    trunk/Src/resource.h

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-22 22:47:39 UTC (rev 4946)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-22 22:52:17 UTC (rev 4947)
@@ -5,6 +5,7 @@
 WinMerge 2.7.7.3
   Resolve conflict files (cvs, svn...) (#1875129)
   Save line filter when edit box loses focus (#1875853)
+  Add link to translations website at help menu (#1699883)
   Manual: Add instructions for conflict file resolving (#1876770)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)

Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot	2008-01-22 22:47:39 UTC (rev 4946)
+++ trunk/Src/Languages/English.pot	2008-01-22 22:52:17 UTC (rev 4947)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-01-23 00:47+0000\n"
+"POT-Creation-Date: 2008-01-22 23:48+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <win...@li...>\n"
@@ -68,7 +68,7 @@
 
 #: Merge.rc:81
 #: Merge.rc:103
-#: Merge.rc:495
+#: Merge.rc:498
 #, c-format
 msgid "&Copy"
 msgstr ""
@@ -80,7 +80,7 @@
 msgstr ""
 
 #: Merge.rc:84
-#: Merge.rc:576
+#: Merge.rc:579
 #, c-format
 msgid "&Goto..."
 msgstr ""
@@ -91,43 +91,43 @@
 msgstr ""
 
 #: Merge.rc:88
-#: Merge.rc:518
-#: Merge.rc:524
+#: Merge.rc:521
+#: Merge.rc:527
 #, c-format
 msgid "with &Registered Application"
 msgstr ""
 
 #: Merge.rc:89
-#: Merge.rc:519
-#: Merge.rc:525
+#: Merge.rc:522
+#: Merge.rc:528
 #, c-format
 msgid "with &External Editor"
 msgstr ""
 
 #: Merge.rc:90
-#: Merge.rc:520
-#: Merge.rc:526
+#: Merge.rc:523
+#: Merge.rc:529
 #, c-format
 msgid "&with..."
 msgstr ""
 
 #: Merge.rc:110
-#: Merge.rc:190
-#: Merge.rc:305
+#: Merge.rc:191
+#: Merge.rc:307
 #, c-format
 msgid "&File"
 msgstr ""
 
 #: Merge.rc:112
-#: Merge.rc:192
-#: Merge.rc:307
+#: Merge.rc:193
+#: Merge.rc:309
 #, c-format
 msgid "&New\tCtrl+N"
 msgstr ""
 
 #: Merge.rc:113
-#: Merge.rc:193
-#: Merge.rc:308
+#: Merge.rc:194
+#: Merge.rc:310
 #, c-format
 msgid "&Open...\tCtrl+O"
 msgstr ""
@@ -143,8 +143,8 @@
 msgstr ""
 
 #: Merge.rc:117
-#: Merge.rc:196
-#: Merge.rc:311
+#: Merge.rc:197
+#: Merge.rc:313
 #, c-format
 msgid "Sa&ve Project..."
 msgstr ""
@@ -155,2528 +155,2532 @@
 msgstr ""
 
 #: Merge.rc:121
-#: Merge.rc:203
-#: Merge.rc:343
+#: Merge.rc:204
+#: Merge.rc:345
 #, c-format
 msgid "E&xit"
 msgstr ""
 
 #: Merge.rc:123
-#: Merge.rc:205
-#: Merge.rc:345
+#: Merge.rc:206
+#: Merge.rc:347
 #, c-format
 msgid "&Edit"
 msgstr ""
 
 #: Merge.rc:125
-#: Merge.rc:209
-#: Merge.rc:379
+#: Merge.rc:210
+#: Merge.rc:381
 #, c-format
 msgid "&Options..."
 msgstr ""
 
 #: Merge.rc:127
-#: Merge.rc:211
-#: Merge.rc:381
+#: Merge.rc:212
+#: Merge.rc:383
 #, c-format
 msgid "&View"
 msgstr ""
 
 #: Merge.rc:129
-#: Merge.rc:222
-#: Merge.rc:383
+#: Merge.rc:223
+#: Merge.rc:385
 #, c-format
 msgid "Select &Font..."
 msgstr ""
 
 #: Merge.rc:130
-#: Merge.rc:223
-#: Merge.rc:384
+#: Merge.rc:224
+#: Merge.rc:386
 #, c-format
 msgid "Use Default F&ont"
 msgstr ""
 
 #: Merge.rc:132
-#: Merge.rc:225
-#: Merge.rc:401
+#: Merge.rc:226
+#: Merge.rc:403
 #, c-format
 msgid "&Toolbar"
 msgstr ""
 
 #: Merge.rc:134
-#: Merge.rc:227
-#: Merge.rc:403
+#: Merge.rc:228
+#: Merge.rc:405
 #, c-format
 msgid "&None"
 msgstr ""
 
 #: Merge.rc:135
-#: Merge.rc:228
-#: Merge.rc:404
+#: Merge.rc:229
+#: Merge.rc:406
 #, c-format
 msgid "&Small"
 msgstr ""
 
 #: Merge.rc:136
-#: Merge.rc:229
-#: Merge.rc:405
+#: Merge.rc:230
+#: Merge.rc:407
 #, c-format
 msgid "&Big"
 msgstr ""
 
 #: Merge.rc:138
-#: Merge.rc:231
-#: Merge.rc:407
+#: Merge.rc:232
+#: Merge.rc:409
 #, c-format
 msgid "&Status Bar"
 msgstr ""
 
 #: Merge.rc:139
-#: Merge.rc:232
-#: Merge.rc:408
+#: Merge.rc:233
+#: Merge.rc:410
 #, c-format
 msgid "Ta&b Bar"
 msgstr ""
 
 #: Merge.rc:141
-#: Merge.rc:235
-#: Merge.rc:412
+#: Merge.rc:236
+#: Merge.rc:414
 #, c-format
 msgid "&Language..."
 msgstr ""
 
 #: Merge.rc:143
-#: Merge.rc:256
-#: Merge.rc:434
+#: Merge.rc:257
+#: Merge.rc:436
 #, c-format
 msgid "&Tools"
 msgstr ""
 
 #: Merge.rc:145
-#: Merge.rc:259
-#: Merge.rc:436
+#: Merge.rc:260
+#: Merge.rc:438
 #, c-format
 msgid "&Filters..."
 msgstr ""
 
 #: Merge.rc:146
-#: Merge.rc:260
-#: Merge.rc:437
+#: Merge.rc:261
+#: Merge.rc:439
 #, c-format
 msgid "&Generate Patch..."
 msgstr ""
 
 #: Merge.rc:148
-#: Merge.rc:263
-#: Merge.rc:440
+#: Merge.rc:264
+#: Merge.rc:442
 #, c-format
 msgid "&Plugins"
 msgstr ""
 
 #: Merge.rc:150
-#: Merge.rc:265
-#: Merge.rc:442
+#: Merge.rc:266
+#: Merge.rc:444
 #, c-format
 msgid "&Manual Unpacking"
 msgstr ""
 
 #: Merge.rc:151
-#: Merge.rc:266
-#: Merge.rc:443
+#: Merge.rc:267
+#: Merge.rc:445
 #, c-format
 msgid "&Automatic Unpacking"
 msgstr ""
 
 #: Merge.rc:153
-#: Merge.rc:268
-#: Merge.rc:445
+#: Merge.rc:269
+#: Merge.rc:447
 #, c-format
 msgid "&Edit with Unpacker"
 msgstr ""
 
 #: Merge.rc:155
-#: Merge.rc:270
-#: Merge.rc:452
+#: Merge.rc:271
+#: Merge.rc:454
 #, c-format
 msgid "&Reload plugins"
 msgstr ""
 
 #: Merge.rc:157
-#: Merge.rc:272
-#: Merge.rc:454
+#: Merge.rc:273
+#: Merge.rc:456
 #, c-format
 msgid "&Debug"
 msgstr ""
 
 #: Merge.rc:159
-#: Merge.rc:274
-#: Merge.rc:456
+#: Merge.rc:275
+#: Merge.rc:458
 #, c-format
 msgid "&Load Config..."
 msgstr ""
 
 #: Merge.rc:160
-#: Merge.rc:275
-#: Merge.rc:457
+#: Merge.rc:276
+#: Merge.rc:459
 #, c-format
 msgid "&Reset Options"
 msgstr ""
 
 #: Merge.rc:162
-#: Merge.rc:277
-#: Merge.rc:459
+#: Merge.rc:278
+#: Merge.rc:461
 #, c-format
 msgid "&Window"
 msgstr ""
 
 #: Merge.rc:164
-#: Merge.rc:279
-#: Merge.rc:461
+#: Merge.rc:280
+#: Merge.rc:463
 #, c-format
 msgid "Cl&ose"
 msgstr ""
 
 #: Merge.rc:165
-#: Merge.rc:280
-#: Merge.rc:462
+#: Merge.rc:281
+#: Merge.rc:464
 #, c-format
 msgid "Clo&se All"
 msgstr ""
 
 #: Merge.rc:167
-#: Merge.rc:282
-#: Merge.rc:464
+#: Merge.rc:283
+#: Merge.rc:466
 #, c-format
 msgid "Change &Pane\tF6"
 msgstr ""
 
 #: Merge.rc:169
-#: Merge.rc:284
-#: Merge.rc:466
+#: Merge.rc:285
+#: Merge.rc:468
 #, c-format
 msgid "Tile &Horizontally"
 msgstr ""
 
 #: Merge.rc:170
-#: Merge.rc:285
-#: Merge.rc:467
+#: Merge.rc:286
+#: Merge.rc:469
 #, c-format
 msgid "Tile &Vertically"
 msgstr ""
 
 #: Merge.rc:171
-#: Merge.rc:286
-#: Merge.rc:468
+#: Merge.rc:287
+#: Merge.rc:470
 #, c-format
 msgid "&Cascade"
 msgstr ""
 
 #: Merge.rc:173
-#: Merge.rc:288
-#: Merge.rc:470
-#: Merge.rc:1884
+#: Merge.rc:289
+#: Merge.rc:472
+#: Merge.rc:1887
 #, c-format
 msgid "&Help"
 msgstr ""
 
 #: Merge.rc:175
-#: Merge.rc:290
-#: Merge.rc:472
+#: Merge.rc:291
+#: Merge.rc:474
 #, c-format
 msgid "&Contents...\tF1"
 msgstr ""
 
 #: Merge.rc:176
-#: Merge.rc:291
-#: Merge.rc:473
+#: Merge.rc:292
+#: Merge.rc:475
 #, c-format
 msgid "&Index..."
 msgstr ""
 
 #: Merge.rc:177
-#: Merge.rc:292
-#: Merge.rc:474
+#: Merge.rc:293
+#: Merge.rc:476
 #, c-format
 msgid "&Search..."
 msgstr ""
 
 #: Merge.rc:179
-#: Merge.rc:294
-#: Merge.rc:476
+#: Merge.rc:295
+#: Merge.rc:478
 #, c-format
 msgid "R&elease Notes"
 msgstr ""
 
 #: Merge.rc:180
-#: Merge.rc:295
-#: Merge.rc:477
+#: Merge.rc:296
+#: Merge.rc:479
 #, c-format
-msgid "C&onfiguration..."
+msgid "&Translations"
 msgstr ""
 
 #: Merge.rc:181
-#: Merge.rc:296
-#: Merge.rc:478
+#: Merge.rc:297
+#: Merge.rc:480
 #, c-format
-msgid "A&rchive Support disabled..."
+msgid "C&onfiguration..."
 msgstr ""
 
-#: Merge.rc:183
+#: Merge.rc:182
 #: Merge.rc:298
-#: Merge.rc:480
+#: Merge.rc:481
 #, c-format
-msgid "&GNU Public License..."
+msgid "A&rchive Support disabled..."
 msgstr ""
 
 #: Merge.rc:184
-#: Merge.rc:299
-#: Merge.rc:481
+#: Merge.rc:300
+#: Merge.rc:483
 #, c-format
+msgid "&GNU Public License..."
+msgstr ""
+
+#: Merge.rc:185
+#: Merge.rc:301
+#: Merge.rc:484
+#, c-format
 msgid "&About WinMerge..."
 msgstr ""
 
-#: Merge.rc:195
-#: Merge.rc:310
+#: Merge.rc:196
+#: Merge.rc:312
 #, c-format
 msgid "Open Pro&ject...\tCtrl+J"
 msgstr ""
 
-#: Merge.rc:198
-#: Merge.rc:329
+#: Merge.rc:199
+#: Merge.rc:331
 #, c-format
 msgid "L&eft Read-only"
 msgstr ""
 
-#: Merge.rc:199
-#: Merge.rc:330
+#: Merge.rc:200
+#: Merge.rc:332
 #, c-format
 msgid "Ri&ght Read-only"
 msgstr ""
 
-#: Merge.rc:201
+#: Merge.rc:202
 #, c-format
 msgid "File En&coding"
 msgstr ""
 
-#: Merge.rc:207
-#: Merge.rc:355
+#: Merge.rc:208
+#: Merge.rc:357
 #, c-format
 msgid "Select &All\tCtrl+A"
 msgstr ""
 
-#: Merge.rc:213
+#: Merge.rc:214
 #, c-format
 msgid "Show &Identical Items"
 msgstr ""
 
-#: Merge.rc:214
+#: Merge.rc:215
 #, c-format
 msgid "Show &Different Items"
 msgstr ""
 
-#: Merge.rc:215
+#: Merge.rc:216
 #, c-format
 msgid "Show L&eft Unique Items"
 msgstr ""
 
-#: Merge.rc:216
+#: Merge.rc:217
 #, c-format
 msgid "Show Ri&ght Unique Items"
 msgstr ""
 
-#: Merge.rc:217
+#: Merge.rc:218
 #, c-format
 msgid "Show S&kipped Items"
 msgstr ""
 
-#: Merge.rc:218
+#: Merge.rc:219
 #, c-format
 msgid "S&how Binary Files"
 msgstr ""
 
-#: Merge.rc:220
+#: Merge.rc:221
 #, c-format
 msgid "Show Hidd&en Items"
 msgstr ""
 
-#: Merge.rc:233
+#: Merge.rc:234
 #, c-format
 msgid "Compa&re Statistics"
 msgstr ""
 
-#: Merge.rc:237
-#: Merge.rc:414
+#: Merge.rc:238
+#: Merge.rc:416
 #, c-format
 msgid "Refre&sh\tF5"
 msgstr ""
 
-#: Merge.rc:238
+#: Merge.rc:239
 #, c-format
 msgid "&Refresh Selected\tCtrl+F5"
 msgstr ""
 
-#: Merge.rc:240
-#: Merge.rc:416
+#: Merge.rc:241
+#: Merge.rc:418
 #, c-format
 msgid "&Merge"
 msgstr ""
 
-#: Merge.rc:242
+#: Merge.rc:243
 #, c-format
 msgid "Co&mpare\tEnter"
 msgstr ""
 
-#: Merge.rc:244
-#: Merge.rc:418
+#: Merge.rc:245
+#: Merge.rc:420
 #, c-format
 msgid "&Next Difference\tAlt+Down"
 msgstr ""
 
-#: Merge.rc:245
-#: Merge.rc:419
+#: Merge.rc:246
+#: Merge.rc:421
 #, c-format
 msgid "&Previous Difference\tAlt+Up"
 msgstr ""
 
-#: Merge.rc:247
-#: Merge.rc:421
+#: Merge.rc:248
+#: Merge.rc:423
 #, c-format
 msgid "&First Difference\tAlt+Home"
 msgstr ""
 
-#: Merge.rc:248
-#: Merge.rc:422
+#: Merge.rc:249
+#: Merge.rc:424
 #, c-format
 msgid "&Current Difference\tAlt+Enter"
 msgstr ""
 
-#: Merge.rc:249
-#: Merge.rc:423
+#: Merge.rc:250
+#: Merge.rc:425
 #, c-format
 msgid "&Last Difference\tAlt+End"
 msgstr ""
 
-#: Merge.rc:251
-#: Merge.rc:425
+#: Merge.rc:252
+#: Merge.rc:427
 #, c-format
 msgid "Copy to &Right\tAlt+Right"
 msgstr ""
 
-#: Merge.rc:252
-#: Merge.rc:426
+#: Merge.rc:253
+#: Merge.rc:428
 #, c-format
 msgid "Copy to L&eft\tAlt+Left"
 msgstr ""
 
-#: Merge.rc:254
+#: Merge.rc:255
 #, c-format
 msgid "&Delete\tDel"
 msgstr ""
 
-#: Merge.rc:258
-#: Merge.rc:549
+#: Merge.rc:259
+#: Merge.rc:552
 #, c-format
 msgid "&Customize Columns..."
 msgstr ""
 
-#: Merge.rc:261
-#: Merge.rc:438
+#: Merge.rc:262
+#: Merge.rc:440
 #, c-format
 msgid "Generate &Report..."
 msgstr ""
 
-#: Merge.rc:313
+#: Merge.rc:315
 #, c-format
 msgid "&Save\tCtrl+S"
 msgstr ""
 
-#: Merge.rc:314
+#: Merge.rc:316
 #, c-format
 msgid "Save &Left"
 msgstr ""
 
-#: Merge.rc:316
-#: Merge.rc:321
+#: Merge.rc:318
+#: Merge.rc:323
 #, c-format
 msgid "&Save"
 msgstr ""
 
-#: Merge.rc:317
-#: Merge.rc:322
+#: Merge.rc:319
+#: Merge.rc:324
 #, c-format
 msgid "Save &As..."
 msgstr ""
 
-#: Merge.rc:319
+#: Merge.rc:321
 #, c-format
 msgid "Save &Right"
 msgstr ""
 
-#: Merge.rc:325
+#: Merge.rc:327
 #, c-format
 msgid "&Print..."
 msgstr ""
 
-#: Merge.rc:326
+#: Merge.rc:328
 #, c-format
 msgid "Page Se&tup"
 msgstr ""
 
-#: Merge.rc:327
+#: Merge.rc:329
 #, c-format
 msgid "Print Previe&w"
 msgstr ""
 
-#: Merge.rc:332
+#: Merge.rc:334
 #, c-format
 msgid "&Convert Line Endings to"
 msgstr ""
 
-#: Merge.rc:334
+#: Merge.rc:336
 #, c-format
 msgid "&DOS (CRLF)"
 msgstr ""
 
-#: Merge.rc:335
+#: Merge.rc:337
 #, c-format
 msgid "&UNIX (LF)"
 msgstr ""
 
-#: Merge.rc:336
+#: Merge.rc:338
 #, c-format
 msgid "&MAC (CR)"
 msgstr ""
 
-#: Merge.rc:339
+#: Merge.rc:341
 #, c-format
 msgid "&Merge Mode\tF9"
 msgstr ""
 
-#: Merge.rc:341
+#: Merge.rc:343
 #, c-format
 msgid "&File Encoding..."
 msgstr ""
 
-#: Merge.rc:347
+#: Merge.rc:349
 #, c-format
 msgid "&Undo\tCtrl+Z"
 msgstr ""
 
-#: Merge.rc:348
+#: Merge.rc:350
 #, c-format
 msgid "&Redo\tCtrl+Y"
 msgstr ""
 
-#: Merge.rc:350
+#: Merge.rc:352
 #, c-format
 msgid "Cu&t\tCtrl+X"
 msgstr ""
 
-#: Merge.rc:351
+#: Merge.rc:353
 #, c-format
 msgid "&Copy\tCtrl+C"
 msgstr ""
 
-#: Merge.rc:352
+#: Merge.rc:354
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr ""
 
-#: Merge.rc:354
+#: Merge.rc:356
 #, c-format
 msgid "Select Line &Difference\tF4"
 msgstr ""
 
-#: Merge.rc:357
+#: Merge.rc:359
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr ""
 
-#: Merge.rc:358
+#: Merge.rc:360
 #, c-format
 msgid "Repla&ce...\tCtrl+H"
 msgstr ""
 
-#: Merge.rc:360
+#: Merge.rc:362
 #, c-format
 msgid "&Scripts"
 msgstr ""
 
-#: Merge.rc:362
-#: Merge.rc:2870
+#: Merge.rc:364
+#: Merge.rc:2874
 #, c-format
 msgid "< Empty >"
 msgstr ""
 
-#: Merge.rc:365
+#: Merge.rc:367
 #, c-format
 msgid "Advanced"
 msgstr ""
 
-#: Merge.rc:367
+#: Merge.rc:369
 #, c-format
 msgid "&Copy With Line Numbers\tCtrl+Shift+C"
 msgstr ""
 
-#: Merge.rc:370
+#: Merge.rc:372
 #, c-format
 msgid "&Bookmarks"
 msgstr ""
 
-#: Merge.rc:372
+#: Merge.rc:374
 #, c-format
 msgid "&Toggle Bookmark\tCtrl+F2"
 msgstr ""
 
-#: Merge.rc:373
+#: Merge.rc:375
 #, c-format
 msgid "&Next Bookmark\tF2"
 msgstr ""
 
-#: Merge.rc:374
+#: Merge.rc:376
 #, c-format
 msgid "&Previous bookmark\tShift+F2"
 msgstr ""
 
-#: Merge.rc:375
+#: Merge.rc:377
 #, c-format
 msgid "&Clear All Bookmarks"
 msgstr ""
 
-#: Merge.rc:377
+#: Merge.rc:379
 #, c-format
 msgid "&Go To...\tCtrl+G"
 msgstr ""
 
-#: Merge.rc:385
+#: Merge.rc:387
 #, c-format
 msgid "Zoom In\tCtrl++"
 msgstr ""
 
-#: Merge.rc:386
+#: Merge.rc:388
 #, c-format
 msgid "Zoom Out\tCtrl+-"
 msgstr ""
 
-#: Merge.rc:387
+#: Merge.rc:389
 #, c-format
 msgid "Syntax Highlight"
 msgstr ""
 
-#: Merge.rc:392
+#: Merge.rc:394
 #, c-format
 msgid "&Lock Panes"
 msgstr ""
 
-#: Merge.rc:393
+#: Merge.rc:395
 #, c-format
 msgid "&View Whitespace"
 msgstr ""
 
-#: Merge.rc:394
+#: Merge.rc:396
 #, c-format
 msgid "Vie&w Line Differences"
 msgstr ""
 
-#: Merge.rc:395
+#: Merge.rc:397
 #, c-format
 msgid "View Line &Numbers"
 msgstr ""
 
-#: Merge.rc:396
+#: Merge.rc:398
 #, c-format
 msgid "View &Margins"
 msgstr ""
 
-#: Merge.rc:397
+#: Merge.rc:399
 #, c-format
 msgid "W&rap Lines"
 msgstr ""
 
-#: Merge.rc:399
+#: Merge.rc:401
 #, c-format
 msgid "Sw&ap Panes"
 msgstr ""
 
-#: Merge.rc:409
+#: Merge.rc:411
 #, c-format
 msgid "Diff &Pane"
 msgstr ""
 
-#: Merge.rc:410
+#: Merge.rc:412
 #, c-format
 msgid "Lo&cation Pane"
 msgstr ""
 
-#: Merge.rc:428
+#: Merge.rc:430
 #, c-format
 msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
 msgstr ""
 
-#: Merge.rc:429
+#: Merge.rc:431
 #, c-format
 msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
 msgstr ""
 
-#: Merge.rc:431
+#: Merge.rc:433
 #, c-format
 msgid "Copy &All to Right"
 msgstr ""
 
-#: Merge.rc:432
+#: Merge.rc:434
 #, c-format
 msgid "Cop&y All to Left"
 msgstr ""
 
-#: Merge.rc:447
+#: Merge.rc:449
 #, c-format
 msgid "&Prediffer"
 msgstr ""
 
-#: Merge.rc:489
+#: Merge.rc:492
 #, c-format
 msgid "Comp&are"
 msgstr ""
 
-#: Merge.rc:490
+#: Merge.rc:493
 #, c-format
 msgid "Co&mpare Special"
 msgstr ""
 
-#: Merge.rc:492
+#: Merge.rc:495
 #, c-format
 msgid "&XML"
 msgstr ""
 
-#: Merge.rc:497
+#: Merge.rc:500
 #, c-format
 msgid "&Left to Right"
 msgstr ""
 
-#: Merge.rc:498
+#: Merge.rc:501
 #, c-format
 msgid "L&eft to..."
 msgstr ""
 
-#: Merge.rc:499
+#: Merge.rc:502
 #, c-format
 msgid "&Right to Left"
 msgstr ""
 
-#: Merge.rc:500
+#: Merge.rc:503
 #, c-format
 msgid "R&ight to..."
 msgstr ""
 
-#: Merge.rc:502
+#: Merge.rc:505
 #, c-format
 msgid "&Move"
 msgstr ""
 
-#: Merge.rc:504
+#: Merge.rc:507
 #, c-format
 msgid "&Left to..."
 msgstr ""
 
-#: Merge.rc:505
+#: Merge.rc:508
 #, c-format
 msgid "&Right to..."
 msgstr ""
 
-#: Merge.rc:507
+#: Merge.rc:510
 #, c-format
 msgid "&Delete"
 msgstr ""
 
-#: Merge.rc:509
-#: Merge.rc:1121
-#: Merge.rc:1500
+#: Merge.rc:512
+#: Merge.rc:1124
+#: Merge.rc:1503
 #, c-format
 msgid "&Left"
 msgstr ""
 
-#: Merge.rc:510
-#: Merge.rc:1123
-#: Merge.rc:1503
+#: Merge.rc:513
+#: Merge.rc:1126
+#: Merge.rc:1506
 #, c-format
 msgid "&Right"
 msgstr ""
 
-#: Merge.rc:511
+#: Merge.rc:514
 #, c-format
 msgid "&Both"
 msgstr ""
 
-#: Merge.rc:513
+#: Merge.rc:516
 #, c-format
 msgid "Re&name"
 msgstr ""
 
-#: Merge.rc:514
+#: Merge.rc:517
 #, c-format
 msgid "&Hide Items"
 msgstr ""
 
-#: Merge.rc:516
+#: Merge.rc:519
 #, c-format
 msgid "&Open Left"
 msgstr ""
 
-#: Merge.rc:522
+#: Merge.rc:525
 #, c-format
 msgid "O&pen Right"
 msgstr ""
 
-#: Merge.rc:529
+#: Merge.rc:532
 #, c-format
 msgid "Cop&y Pathnames"
 msgstr ""
 
-#: Merge.rc:531
+#: Merge.rc:534
 #, c-format
 msgid "&Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:532
+#: Merge.rc:535
 #, c-format
 msgid "&Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:533
+#: Merge.rc:536
 #, c-format
 msgid "&Both (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:535
+#: Merge.rc:538
 #, c-format
 msgid "Copy &Filenames"
 msgstr ""
 
-#: Merge.rc:537
+#: Merge.rc:540
 #, c-format
 msgid "&Zip"
 msgstr ""
 
-#: Merge.rc:539
+#: Merge.rc:542
 #, c-format
 msgid "&Left... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:540
+#: Merge.rc:543
 #, c-format
 msgid "&Right... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:541
+#: Merge.rc:544
 #, c-format
 msgid "&Both... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:542
+#: Merge.rc:545
 #, c-format
 msgid "&Differences... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:545
+#: Merge.rc:548
 #, c-format
 msgid "&Refresh"
 msgstr ""
 
-#: Merge.rc:557
+#: Merge.rc:560
 #, c-format
 msgid "&Copy Full Path"
 msgstr ""
 
-#: Merge.rc:558
+#: Merge.rc:561
 #, c-format
 msgid "Copy &Filename"
 msgstr ""
 
-#: Merge.rc:564
+#: Merge.rc:567
 #, c-format
 msgid "Prediffer Settings"
 msgstr ""
 
-#: Merge.rc:566
+#: Merge.rc:569
 #, c-format
 msgid "&No prediffer"
 msgstr ""
 
-#: Merge.rc:567
+#: Merge.rc:570
 #, c-format
 msgid "Auto prediffer"
 msgstr ""
 
-#: Merge.rc:575
+#: Merge.rc:578
 #, c-format
 msgid "G&oto Diff"
 msgstr ""
 
-#: Merge.rc:578
+#: Merge.rc:581
 #, c-format
 msgid "&No Moved Blocks"
 msgstr ""
 
-#: Merge.rc:579
+#: Merge.rc:582
 #, c-format
 msgid "&All Moved Blocks"
 msgstr ""
 
-#: Merge.rc:580
+#: Merge.rc:583
 #, c-format
 msgid "Moved Block for &Current Diff"
 msgstr ""
 
-#: Merge.rc:648
+#: Merge.rc:651
 #, c-format
 msgid "About WinMerge"
 msgstr ""
 
-#: Merge.rc:654
+#: Merge.rc:657
 #, c-format
 msgid "(Private Build)"
 msgstr ""
 
-#: Merge.rc:655
+#: Merge.rc:658
 #, c-format
 msgid "All rights reserved."
 msgstr ""
 
-#: Merge.rc:656
+#: Merge.rc:659
 #, c-format
 msgid "Visit the WinMerge HomePage!"
 msgstr ""
 
-#: Merge.rc:659
-#: Merge.rc:690
-#: Merge.rc:780
-#: Merge.rc:966
-#: Merge.rc:1040
-#: Merge.rc:1069
-#: Merge.rc:1079
-#: Merge.rc:1242
-#: Merge.rc:1306
-#: Merge.rc:1319
-#: Merge.rc:1411
-#: Merge.rc:1426
+#: Merge.rc:662
+#: Merge.rc:693
+#: Merge.rc:783
+#: Merge.rc:969
+#: Merge.rc:1043
+#: Merge.rc:1072
+#: Merge.rc:1082
+#: Merge.rc:1245
+#: Merge.rc:1309
+#: Merge.rc:1322
+#: Merge.rc:1414
+#: Merge.rc:1429
 #, c-format
 msgid "OK"
 msgstr ""
 
-#: Merge.rc:660
+#: Merge.rc:663
 #, c-format
 msgid "Contributors"
 msgstr ""
 
-#: Merge.rc:666
+#: Merge.rc:669
 #, c-format
 msgid "Select Files or Folders"
 msgstr ""
 
-#: Merge.rc:669
-#: Merge.rc:1577
+#: Merge.rc:672
+#: Merge.rc:1580
 #, c-format
 msgid "&Left:"
 msgstr ""
 
-#: Merge.rc:673
-#: Merge.rc:734
-#: Merge.rc:990
-#: Merge.rc:1005
+#: Merge.rc:676
+#: Merge.rc:737
+#: Merge.rc:993
+#: Merge.rc:1008
 #, c-format
 msgid "&Browse..."
 msgstr ""
 
-#: Merge.rc:674
-#: Merge.rc:1581
+#: Merge.rc:677
+#: Merge.rc:1584
 #, c-format
 msgid "&Right:"
 msgstr ""
 
-#: Merge.rc:678
-#: Merge.rc:1016
+#: Merge.rc:681
+#: Merge.rc:1019
 #, c-format
 msgid "Bro&wse..."
 msgstr ""
 
-#: Merge.rc:679
-#: Merge.rc:1585
+#: Merge.rc:682
+#: Merge.rc:1588
 #, c-format
 msgid "&Filter:"
 msgstr ""
 
-#: Merge.rc:682
-#: Merge.rc:1587
+#: Merge.rc:685
+#: Merge.rc:1590
 #, c-format
 msgid "Select..."
 msgstr ""
 
-#: Merge.rc:683
+#: Merge.rc:686
 #, c-format
 msgid "&Unpacker:"
 msgstr ""
 
-#: Merge.rc:686
+#: Merge.rc:689
 #, c-format
 msgid "&Select..."
 msgstr ""
 
-#: Merge.rc:687
-#: Merge.rc:1588
+#: Merge.rc:690
+#: Merge.rc:1591
 #, c-format
 msgid "&Include Subfolders"
 msgstr ""
 
-#: Merge.rc:689
+#: Merge.rc:692
 #, c-format
 msgid "Status:"
 msgstr ""
 
-#: Merge.rc:691
-#: Merge.rc:721
-#: Merge.rc:781
-#: Merge.rc:811
-#: Merge.rc:843
-#: Merge.rc:853
-#: Merge.rc:1041
-#: Merge.rc:1070
-#: Merge.rc:1080
-#: Merge.rc:1131
-#: Merge.rc:1243
-#: Merge.rc:1320
-#: Merge.rc:1412
-#: Merge.rc:1427
+#: Merge.rc:694
+#: Merge.rc:724
+#: Merge.rc:784
+#: Merge.rc:814
+#: Merge.rc:846
+#: Merge.rc:856
+#: Merge.rc:1044
+#: Merge.rc:1073
+#: Merge.rc:1083
+#: Merge.rc:1134
+#: Merge.rc:1246
+#: Merge.rc:1323
+#: Merge.rc:1415
+#: Merge.rc:1430
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: Merge.rc:692
-#: Merge.rc:1321
+#: Merge.rc:695
+#: Merge.rc:1324
 #, c-format
 msgid "Help"
 msgstr ""
 
-#: Merge.rc:693
+#: Merge.rc:696
 #, c-format
 msgid "Files or Folders to Compare"
 msgstr ""
 
-#: Merge.rc:700
+#: Merge.rc:703
 #, c-format
 msgid "Visual SourceSafe"
 msgstr ""
 
-#: Merge.rc:705
+#: Merge.rc:708
 #, c-format
 msgid "Database:"
 msgstr ""
 
-#: Merge.rc:708
+#: Merge.rc:711
 #, c-format
 msgid "Project:"
 msgstr ""
 
-#: Merge.rc:711
+#: Merge.rc:714
 #, c-format
 msgid "User:"
 msgstr ""
 
-#: Merge.rc:713
+#: Merge.rc:716
 #, c-format
 msgid "Password:"
 msgstr ""
 
-#: Merge.rc:715
+#: Merge.rc:718
 #, c-format
 msgid "Link to Destination VSS project"
 msgstr ""
 
-#: Merge.rc:717
-#: Merge.rc:858
+#: Merge.rc:720
+#: Merge.rc:861
 #, c-format
 msgid "Apply to all items"
 msgstr ""
 
-#: Merge.rc:719
+#: Merge.rc:722
 #, c-format
 msgid "Check Out"
 msgstr ""
 
-#: Merge.rc:720
-#: Merge.rc:854
+#: Merge.rc:723
+#: Merge.rc:857
 #, c-format
 msgid "Save As..."
 msgstr ""
 
-#: Merge.rc:726
+#: Merge.rc:729
 #, c-format
 msgid "Versioning System"
 msgstr ""
 
-#: Merge.rc:729
+#: Merge.rc:732
 #, c-format
 msgid "&Versioning System:"
 msgstr ""
 
-#: Merge.rc:732
+#: Merge.rc:735
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr ""
 
-#: Merge.rc:739
-#: Merge.rc:1892
+#: Merge.rc:742
+#: Merge.rc:1895
 #, c-format
 msgid "General"
 msgstr ""
 
-#: Merge.rc:742
+#: Merge.rc:745
 #, c-format
 msgid "Automatically &scroll to first difference"
 msgstr ""
 
-#: Merge.rc:745
+#: Merge.rc:748
 #, c-format
 msgid "&Disable Splash Screen"
 msgstr ""
 
-#: Merge.rc:747
+#: Merge.rc:750
 #, c-format
 msgid "Cl&ose windows with ESC"
 msgstr ""
 
-#: Merge.rc:749
+#: Merge.rc:752
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
 msgstr ""
 
-#: Merge.rc:752
+#: Merge.rc:755
 #, c-format
 msgid "All&ow only one instance to run"
 msgstr ""
 
-#: Merge.rc:754
+#: Merge.rc:757
 #, c-format
 msgid "As&k when closing multiple windows"
 msgstr ""
 
-#: Merge.rc:756
+#: Merge.rc:759
 #, c-format
 msgid "&Preserve file time in file compare"
 msgstr ""
 
-#: Merge.rc:759
+#: Merge.rc:762
 #, c-format
 msgid "O&pen-dialog Auto-Completion:"
 msgstr ""
 
-#: Merge.rc:762
+#: Merge.rc:765
 #, c-format
 msgid "Enable multiple compare windows for"
 msgstr ""
 
-#: Merge.rc:764
-#: Merge.rc:1600
+#: Merge.rc:767
+#: Merge.rc:1603
 #, c-format
 msgid "&Folder compare"
 msgstr ""
 
-#: Merge.rc:766
-#: Merge.rc:1602
+#: Merge.rc:769
+#: Merge.rc:1605
 #, c-format
 msgid "Fil&e compare"
 msgstr ""
 
-#: Merge.rc:768
+#: Merge.rc:771
 #, c-format
 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
 msgstr ""
 
-#: Merge.rc:770
+#: Merge.rc:773
 #, c-format
 msgid "Reset"
 msgstr ""
 
-#: Merge.rc:777
+#: Merge.rc:780
 #, c-format
 msgid "Language"
 msgstr ""
 
-#: Merge.rc:784
+#: Merge.rc:787
 #, c-format
 msgid "Available languages:"
 msgstr ""
 
-#: Merge.rc:790
+#: Merge.rc:793
 #, c-format
 msgid "Find"
 msgstr ""
 
-#: Merge.rc:793
-#: Merge.rc:820
+#: Merge.rc:796
+#: Merge.rc:823
 #, c-format
 msgid "Fi&nd what:"
 msgstr ""
 
-#: Merge.rc:796
-#: Merge.rc:826
+#: Merge.rc:799
+#: Merge.rc:829
 #, c-format
 msgid "Match &whole word only"
 msgstr ""
 
-#: Merge.rc:798
-#: Merge.rc:828
+#: Merge.rc:801
+#: Merge.rc:831
 #, c-format
 msgid "Match &case"
 msgstr ""
 
-#: Merge.rc:800
-#: Merge.rc:830
+#: Merge.rc:803
+#: Merge.rc:833
 #, c-format
 msgid "Regular &expression"
 msgstr ""
 
-#: Merge.rc:802
+#: Merge.rc:805
 #, c-format
 msgid "D&on't wrap end of file"
 msgstr ""
 
-#: Merge.rc:805
+#: Merge.rc:808
 #, c-format
 msgid "Direction"
 msgstr ""
 
-#: Merge.rc:806
+#: Merge.rc:809
 #, c-format
 msgid "&Up"
 msgstr ""
 
-#: Merge.rc:808
+#: Merge.rc:811
 #, c-format
 msgid "&Down"
 msgstr ""
 
-#: Merge.rc:810
-#: Merge.rc:840
+#: Merge.rc:813
+#: Merge.rc:843
 #, c-format
 msgid "&Find Next"
 msgstr ""
 
-#: Merge.rc:817
+#: Merge.rc:820
 #, c-format
 msgid "Replace"
 msgstr ""
 
-#: Merge.rc:823
+#: Merge.rc:826
 #, c-format
 msgid "Re&place with:"
 msgstr ""
 
-#: Merge.rc:832
+#: Merge.rc:835
 #, c-format
 msgid "&Don't wrap end of file"
 msgstr ""
 
-#: Merge.rc:835
+#: Merge.rc:838
 #, c-format
 msgid "Replace in"
 msgstr ""
 
-#: Merge.rc:836
+#: Merge.rc:839
 #, c-format
 msgid "&Selection"
 msgstr ""
 
-#: Merge.rc:838
+#: Merge.rc:841
 #, c-format
 msgid "Wh&ole file"
 msgstr ""
 
-#: Merge.rc:841
+#: Merge.rc:844
 #, c-format
 msgid "&Replace"
 msgstr ""
 
-#: Merge.rc:842
+#: Merge.rc:845
 #, c-format
 msgid "Replace &All"
 msgstr ""
 
-#: Merge.rc:849
-#: Merge.rc:2120
+#: Merge.rc:852
+#: Merge.rc:2123
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
 
-#: Merge.rc:852
+#: Merge.rc:855
 #, c-format
 msgid "CheckOut"
 msgstr ""
 
-#: Merge.rc:857
-#: Merge.rc:1162
+#: Merge.rc:860
+#: Merge.rc:1165
 #, c-format
 msgid "Comments"
 msgstr ""
 
-#: Merge.rc:860
+#: Merge.rc:863
 #, c-format
 msgid "CheckIn after checkout"
 msgstr ""
 
-#: Merge.rc:866
+#: Merge.rc:869
 #, c-format
 msgid "Linefilters"
 msgstr ""
 
-#: Merge.rc:869
+#: Merge.rc:872
 #, c-format
 msgid "Enable Line Filters"
 msgstr ""
 
-#: Merge.rc:872
+#: Merge.rc:875
 #, c-format
 msgid "Regular Expressions (one per line):"
 msgstr ""
 
-#: Merge.rc:879
+#: Merge.rc:882
 #, c-format
 msgid "Save"
 msgstr ""
 
-#: Merge.rc:880
+#: Merge.rc:883
 #, c-format
 msgid "New"
 msgstr ""
 
-#: Merge.rc:881
+#: Merge.rc:884
 #, c-format
 msgid "Edit"
 msgstr ""
 
-#: Merge.rc:882
+#: Merge.rc:885
 #, c-format
 msgid "Remove"
 msgstr ""
 
-#: Merge.rc:887
-#: Merge.rc:1895
+#: Merge.rc:890
+#: Merge.rc:1898
 #, c-format
 msgid "Colors"
 msgstr ""
 
-#: Merge.rc:890
+#: Merge.rc:893
 #, c-format
 msgid "Difference:"
 msgstr ""
 
-#: Merge.rc:894
+#: Merge.rc:897
 #, c-format
 msgid "Selected Difference:"
 msgstr ""
 
-#: Merge.rc:898
-#: Merge.rc:1552
+#: Merge.rc:901
+#: Merge.rc:1555
 #, c-format
 msgid "Background"
 msgstr ""
 
-#: Merge.rc:899
+#: Merge.rc:902
 #, c-format
 msgid "Deleted"
 msgstr ""
 
-#: Merge.rc:912
-#: Merge.rc:1347
-#: Merge.rc:1553
+#: Merge.rc:915
+#: Merge.rc:1350
+#: Merge.rc:1556
 #, c-format
 msgid "Text"
 msgstr ""
 
-#: Merge.rc:916
+#: Merge.rc:919
 #, c-format
 msgid "Ignored Difference:"
 msgstr ""
 
-#: Merge.rc:926
+#: Merge.rc:929
 #, c-format
 msgid "Moved:"
 msgstr ""
 
-#: Merge.rc:936
+#: Merge.rc:939
 #, c-format
 msgid "Selected Moved:"
 msgstr ""
 
-#: Merge.rc:943
+#: Merge.rc:946
 #, c-format
 msgid "Word Difference:"
 msgstr ""
 
-#: Merge.rc:950
+#: Merge.rc:953
 #, c-format
 msgid "Selected Word Diff:"
 msgstr ""
 
-#: Merge.rc:957
-#: Merge.rc:1039
-#: Merge.rc:1068
-#: Merge.rc:1165
-#: Merge.rc:1393
+#: Merge.rc:960
+#: Merge.rc:1042
+#: Merge.rc:1071
+#: Merge.rc:1168
+#: Merge.rc:1396
 #, c-format
 msgid "Defaults"
 msgstr ""
 
-#: Merge.rc:963
-#: Merge.rc:1335
-#: Merge.rc:1541
+#: Merge.rc:966
+#: Merge.rc:1338
+#: Merge.rc:1544
 #, c-format
 msgid "Dialog"
 msgstr ""
 
-#: Merge.rc:973
-#: Merge.rc:1898
+#: Merge.rc:976
+#: Merge.rc:1901
 #, c-format
 msgid "System"
 msgstr ""
 
-#: Merge.rc:976
+#: Merge.rc:979
 #, c-format
 msgid "&Send deleted files to Recycle Bin"
 msgstr ""
 
-#: Merge.rc:978
+#: Merge.rc:981
 #, c-format
 msgid "Ign&ore time differences less than 3 seconds"
 msgstr ""
 
-#: Merge.rc:981
+#: Merge.rc:984
 #, c-format
 msgid "Integration"
 msgstr ""
 
-#: Merge.rc:982
+#: Merge.rc:985
 #, c-format
 msgid "&Add to explorer context menu"
 msgstr ""
 
-#: Merge.rc:984
+#: Merge.rc:987
 #, c-format
 msgid "E&nable advanced menu"
 msgstr ""
 
-#: Merge.rc:986
+#: Merge.rc:989
 #, c-format
 msgid "In&clude subfolders by default"
 msgstr ""
 
-#: Merge.rc:988
+#: Merge.rc:991
 #, c-format
 msgid "&External editor:"
 msgstr ""
 
-#: Merge.rc:991
+#: Merge.rc:994
 #, c-format
 msgid "&Filter folder:"
 msgstr ""
 
-#: Merge.rc:993
-#: Merge.rc:1405
-#: Merge.rc:1579
-#: Merge.rc:1583
-#: Merge.rc:1610
+#: Merge.rc:996
+#: Merge.rc:1408
+#: Merge.rc:1582
+#: Merge.rc:1586
+#: Merge.rc:1613
 #, c-format
 msgid "Browse..."
 msgstr ""
 
-#: Merge.rc:999
+#: Merge.rc:1002
 #, c-format
 msgid "Patch Generator"
 msgstr ""
 
-#: Merge.rc:1002
+#: Merge.rc:1005
 #, c-format
 msgid "File&1:"
 msgstr ""
 
-#: Merge.rc:1006
+#: Merge.rc:1009
 #, c-format
 msgid "File&2:"
 msgstr ""
 
-#: Merge.rc:1009
+#: Merge.rc:1012
 #, c-format
 msgid "Br&owse..."
 msgstr ""
 
-#: Merge.rc:1010
+#: Merge.rc:1013
 #, c-format
 msgid "&Swap"
 msgstr ""
 
-#: Merge.rc:1011
+#: Merge.rc:1014
 #, c-format
 msgid "&Append to existing file"
 msgstr ""
 
-#: Merge.rc:1013
+#: Merge.rc:1016
 #, c-format
 msgid "&Result:"
 msgstr ""
 
-#: Merge.rc:1017
+#: Merge.rc:1020
 #, c-format
 msgid "&Format"
 msgstr ""
 
-#: Merge.rc:1018
+#: Merge.rc:1021
 #, c-format
 msgid "St&yle:"
 msgstr ""
 
-#: Merge.rc:1021
+#: Merge.rc:1024
 #, c-format
 msgid "&Context:"
 msgstr ""
 
-#: Merge.rc:1024
+#: Merge.rc:1027
 #, c-format
 msgid "W&hitespaces"
 msgstr ""
 
-#: Merge.rc:1025
+#: Merge.rc:1028
 #, c-format
 msgid "Com&pare"
 msgstr ""
 
-#: Merge.rc:1027
+#: Merge.rc:1030
 #, c-format
 msgid "I&gnore changes"
 msgstr ""
 
-#: Merge.rc:1029
+#: Merge.rc:1032
 #, c-format
 msgid "Ig&nore all"
 msgstr ""
 
-#: Merge.rc:1031
+#: Merge.rc:1034
 #, c-format
 msgid "Ignor&e blank lines"
 msgstr ""
 
-#: Merge.rc:1033
+#: Merge.rc:1036
 #, c-format
 msgid "Case sensi&tive"
 msgstr ""
 
-#: Merge.rc:1035
+#: Merge.rc:1038
 #, c-format
 msgid "Inclu&de command line"
 msgstr ""
 
-#: Merge.rc:1037
+#: Merge.rc:1040
 #, c-format
 msgid "Open to e&xternal editor"
 msgstr ""
 
-#: Merge.rc:1059
+#: Merge.rc:1062
 #, c-format
 msgid "Display Columns"
 msgstr ""
 
-#: Merge.rc:1065
+#: Merge.rc:1068
 #, c-format
 msgid "Move &Up"
 msgstr ""
 
-#: Merge.rc:1066
+#: Merge.rc:1069
 #, c-format
 msgid "Move &Down"
 msgstr ""
 
-#: Merge.rc:1076
+#: Merge.rc:1079
 #, c-format
 msgid "Select Unpacker"
 msgstr ""
 
-#: Merge.rc:1081
+#: Merge.rc:1084
 #, c-format
 msgid "File unpacker:"
 msgstr ""
 
-#: Merge.rc:1084
+#: Merge.rc:1087
 #, c-format
 msgid "Display all unpackers, don't check the extension"
 msgstr ""
 
-#: Merge.rc:1087
+#: Merge.rc:1090
 #, c-format
 msgid "Extensions list:"
 msgstr ""
 
-#: Merge.rc:1088
+#: Merge.rc:1091
 #, c-format
 msgid "Description:"
 msgstr ""
 
-#: Merge.rc:1099
+#: Merge.rc:1102
 #, c-format
 msgid " Folder Compare Progress"
 msgstr ""
 
-#: Merge.rc:1102
-#: Merge.rc:1845
+#: Merge.rc:1105
+#: Merge.rc:1848
 #, c-format
 msgid "Stop"
 msgstr ""
 
-#: Merge.rc:1107
+#: Merge.rc:1110
 #, c-format
 msgid "Comparing items..."
 msgstr ""
 
-#: Merge.rc:1108
+#: Merge.rc:1111
 #, c-format
 msgid "Items compared:"
 msgstr ""
 
-#: Merge.rc:1109
+#: Merge.rc:1112
 #, c-format
 msgid "Items total:"
 msgstr ""
 
-#: Merge.rc:1115
+#: Merge.rc:1118
 #, c-format
 msgid "Go To"
 msgstr ""
 
-#: Merge.rc:1118
+#: Merge.rc:1121
 #, c-format
 msgid "G&oto:"
 msgstr ""
 
-#: Merge.rc:1120
+#: Merge.rc:1123
 #, c-format
 msgid "File"
 msgstr ""
 
-#: Merge.rc:1125
+#: Merge.rc:1128
 #, c-format
 msgid "Goto what"
 msgstr ""
 
-#: Merge.rc:1126
+#: Merge.rc:1129
 #, c-format
 msgid "Li&ne"
 msgstr ""
 
-#: Merge.rc:1128
+#: Merge.rc:1131
 #, c-format
 msgid "&Difference"
 msgstr ""
 
-#: Merge.rc:1130
+#: Merge.rc:1133
 #, c-format
 msgid "&Go To"
 msgstr ""
 
-#: Merge.rc:1136
-#: Merge.rc:1893
+#: Merge.rc:1139
+#: Merge.rc:1896
 #, c-format
 msgid "Compare"
 msgstr ""
 
-#: Merge.rc:1139
+#: Merge.rc:1142
 #, c-format
 msgid "Whitespace"
 msgstr ""
 
-#: Merge.rc:1140
+#: Merge.rc:1143
 #, c-format
 msgid "&Compare"
 msgstr ""
 
-#: Merge.rc:1142
+#: Merge.rc:1145
 #, c-format
 msgid "&Ignore change"
 msgstr ""
 
-#: Merge.rc:1144
+#: Merge.rc:1147
 #, c-format
 msgid "I&gnore all"
 msgstr ""
 
-#: Merge.rc:1146
+#: Merge.rc:1149
 #, c-format
 msgid "Ignore blan&k lines"
 msgstr ""
 
-#: Merge.rc:1148
+#: Merge.rc:1151
 #, c-format
 msgid "Ignore &case"
 msgstr ""
 
-#: Merge.rc:1150
+#: Merge.rc:1153
 #, c-format
 msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
 msgstr ""
 
-#: Merge.rc:1153
+#: Merge.rc:1156
 #, c-format
 msgid "E&nable moved block detection"
 msgstr ""
 
-#: Merge.rc:1155
+#: Merge.rc:1158
 #, c-format
 msgid "&Match similar lines"
 msgstr ""
 
-#: Merge.rc:1157
+#: Merge.rc:1160
 #, c-format
 msgid "&File Compare method:"
 msgstr ""
 
-#: Merge.rc:1160
+#: Merge.rc:1163
 #, c-format
 msgid "S&top after first difference"
 msgstr ""
 
-#: Merge.rc:1163
+#: Merge.rc:1166
 #, c-format
 msgid "Filter Comments"
 msgstr ""
 
-#: Merge.rc:1170
-#: Merge.rc:1894
+#: Merge.rc:1173
+#: Merge.rc:1897
 #, c-format
 msgid "Editor"
 msgstr ""
 
-#: Merge.rc:1173
+#: Merge.rc:1176
 #, c-format
 msgid "&Highlight syntax"
 msgstr ""
 
-#: Merge.rc:1175
+#: Merge.rc:1178
 #, c-format
 msgid "&Automatic rescan"
 msgstr ""
 
-#: Merge.rc:1177
+#: Merge.rc:1180
 #, c-format
 msgid "&Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1179
+#: Merge.rc:1182
 #, c-format
 msgid "Tabs"
 msgstr ""
 
-#: Merge.rc:1180
+#: Merge.rc:1183
 #, c-format
 msgid "&Tab size:"
 msgstr ""
 
-#: Merge.rc:1183
+#: Merge.rc:1186
 #, c-format
 msgid "&Insert Tabs"
 msgstr ""
 
-#: Merge.rc:1185
+#: Merge.rc:1188
 #, c-format
 msgid "Insert &Spaces"
 msgstr ""
 
-#: Merge.rc:1187
+#: Merge.rc:1190
 #, c-format
 msgid "Line Difference Coloring"
 msgstr ""
 
-#: Merge.rc:1189
+#: Merge.rc:1192
 #, c-format
 msgid "View line differences"
 msgstr ""
 
-#: Merge.rc:1191
+#: Merge.rc:1194
 #, c-format
 msgid "&Character level"
 msgstr ""
 
-#: Merge.rc:1193
+#: Merge.rc:1196
 #, c-format
 msgid "&Word-level:"
 msgstr ""
 
-#: Merge.rc:1208
+#: Merge.rc:1211
 #, c-format
 msgid "Filefilters"
 msgstr ""
 
-#: Merge.rc:1214
+#: Merge.rc:1217
 #, c-format
 msgid "Test"
 msgstr ""
 
-#: Merge.rc:1215
+#: Merge.rc:1218
 #, c-format
 msgid "Install..."
 msgstr ""
 
-#: Merge.rc:1216
+#: Merge.rc:1219
 #, c-format
 msgid "New..."
 msgstr ""
 
-#: Merge.rc:1217
+#: Merge.rc:1220
 #, c-format
 msgid "Edit..."
 msgstr ""
 
-#: Merge.rc:1218
+#: Merge.rc:1221
 #, c-format
 msgid "Delete..."
 msgstr ""
 
-#: Merge.rc:1224
+#: Merge.rc:1227
 #, c-format
 msgid "Save modified files?"
 msgstr ""
 
-#: Merge.rc:1227
+#: Merge.rc:1230
 #, c-format
 msgid "Left side file"
 msgstr ""
 
-#: Merge.rc:1230
+#: Merge.rc:1233
 #, c-format
 msgid "&Save changes"
 msgstr ""
 
-#: Merge.rc:1232
+#: Merge.rc:1235
 #, c-format
 msgid "&Discard changes"
 msgstr ""
 
-#: Merge.rc:1234
+#: Merge.rc:1237
 #, c-format
 msgid "Right side file"
 msgstr ""
 
-#: Merge.rc:1237
+#: Merge.rc:1240
 #, c-format
 msgid "S&ave changes"
 msgstr ""
 
-#: Merge.rc:1239
+#: Merge.rc:1242
 #, c-format
 msgid "Dis&card changes"
 msgstr ""
 
-#: Merge.rc:1241
+#: Merge.rc:1244
 #, c-format
 msgid "Discard All"
 msgstr ""
 
-#: Merge.rc:1248
-#: Merge.rc:1496
-#: Merge.rc:1900
+#: Merge.rc:1251
+#: Merge.rc:1499
+#: Merge.rc:1903
 #, c-format
 msgid "Codepage"
 msgstr ""
 
-#: Merge.rc:1251
+#: Merge.rc:1254
 #, c-format
 msgid "Default Codepage"
 msgstr ""
 
-#: Merge.rc:1252
+#: Merge.rc:1255
 #, c-format
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr ""
 
-#: Merge.rc:1254
+#: Merge.rc:1257
 #, c-format
 msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
 msgstr ""
 
-#: Merge.rc:1257
+#: Merge.rc:1260
 #, c-format
 msgid "System codepage"
 msgstr ""
 
-#: Merge.rc:1259
+#: Merge.rc:1262
 #, c-format
 msgid "According to WinMerge User Interface"
 msgstr ""
 
-#: Merge.rc:1261
+#: Merge.rc:1264
 #, c-format
 msgid "Custom codepage :"
 msgstr ""
 
-#: Merge.rc:1269
+#: Merge.rc:1272
 #, c-format
 msgid "WinMerge - Archive support disabled"
 msgstr ""
 
-#: Merge.rc:1272
+#: Merge.rc:1275
 #, c-format
 msgid "Unable to detect 7-Zip version (not installed?)"
 msgstr ""
 
-#: Merge.rc:1275
+#: Merge.rc:1278
 #, c-format
 msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation."
 msgstr ""
 
-#: Merge.rc:1277
+#: Merge.rc:1280
 #, c-format
 msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
 msgstr ""
 
-#: Merge.rc:1279
+#: Merge.rc:1282
 #, c-format
 msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
 msgstr ""
 
-#: Merge.rc:1281
+#: Merge.rc:1284
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: Merge.rc:1283
+#: Merge.rc:1286
 #, c-format
 msgid "Plugin required\n(dllbuild %04u)"
 msgstr ""
 
-#: Merge.rc:1285
+#: Merge.rc:1288
 #, c-format
 msgid "Recommended version of 7-Zip:"
 msgstr ""
 
-#: Merge.rc:1288
 #: Merge.rc:1291
+#: Merge.rc:1294
 #, c-format
 msgid "present"
 msgstr ""
 
-#: Merge.rc:1289
+#: Merge.rc:1292
 #, c-format
 msgid "Merge7z000U.dll"
 msgstr ""
 
-#: Merge.rc:1292
+#: Merge.rc:1295
 #, c-format
 msgid "7-Zip software installed on your computer:"
 msgstr ""
 
-#: Merge.rc:1294
-#: Merge.rc:1299
+#: Merge.rc:1297
+#: Merge.rc:1302
 #, c-format
 msgid "none"
 msgstr ""
 
-#: Merge.rc:1296
+#: Merge.rc:1299
 #, c-format
 msgid "missing"
 msgstr ""
 
-#: Merge.rc:1297
+#: Merge.rc:1300
 #, c-format
 msgid "7-Zip components for standalone operation:"
 msgstr ""
 
-#: Merge.rc:1301
+#: Merge.rc:1304
 #, c-format
 msgid "outdated"
 msgstr ""
 
-#: Merge.rc:1302
+#: Merge.rc:1305
 #, c-format
 msgid "Plugins on path:"
 msgstr ""
 
-#: Merge.rc:1303
+#: Merge.rc:1306
 #, c-format
 msgid "Don't display this &message again.\n(You can always recall this message from help menu.)"
 msgstr ""
 
-#: Merge.rc:1307
+#: Merge.rc:1310
 #, c-format
 msgid "Plugin Download"
 msgstr ""
 
-#: Merge.rc:1316
+#: Merge.rc:1319
 #, c-format
 msgid "Options"
 msgstr ""
 
-#: Merge.rc:1327
+#: Merge.rc:1330
 #, c-format
 msgid " Categories"
 msgstr ""
 
-#: Merge.rc:1329
+#: Merge.rc:1332
 #, c-format
 msgid "Import..."
 msgstr ""
 
-#: Merge.rc:1330
+#: Merge.rc:1333
 #, c-format
 msgid "Export..."
 msgstr ""
 
-#: Merge.rc:1338
+#: Merge.rc:1341
 #, c-format
 msgid "Keywords:"
 msgstr ""
 
-#: Merge.rc:1339
+#: Merge.rc:1342
 #, c-format
 msgid "Function names:"
 msgstr ""
 
-#: Merge.rc:1340
+#: Merge.rc:1343
 #, c-format
 msgid "Comments:"
 msgstr ""
 
-#: Merge.rc:1341
+#: Merge.rc:1344
 #, c-format
 msgid "Numbers:"
 msgstr ""
 
-#: Merge.rc:1342
+#: Merge.rc:1345
 #, c-format
 msgid "Operators:"
 msgstr ""
 
-#: Merge.rc:1343
+#: Merge.rc:1346
 #, c-format
 msgid "Strings:"
 msgstr ""
 
-#: Merge.rc:1344
+#: Merge.rc:1347
 #, c-format
 msgid "Preprocessor:"
 msgstr ""
 
-#: Merge.rc:1345
+#: Merge.rc:1348
 #, c-format
 msgid "User 1:"
 msgstr ""
 
-#: Merge.rc:1346
+#: Merge.rc:1349
 #, c-format
 msgid "User 2:"
 msgstr ""
 
-#: Merge.rc:1351
-#: Merge.rc:1356
-#: Merge.rc:1361
-#: Merge.rc:1366
-#: Merge.rc:1371
-#: Merge.rc:1376
-#: Merge.rc:1381
-#: Merge.rc:1386
-#: Merge.rc:1391
+#: Merge.rc:1354
+#: Merge.rc:1359
+#: Merge.rc:1364
+#: Merge.rc:1369
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
 #, c-format
 msgid "Bold"
 msgstr ""
 
-#: Merge.rc:1399
+#: Merge.rc:1402
 #, c-format
 msgid "Folder Compare Report"
 msgstr ""
 
-#: Merge.rc:1402
+#: Merge.rc:1405
 #, c-format
 msgid "Report &File:"
 msgstr ""
 
-#: Merge.rc:1406
+#: Merge.rc:1409
 #, c-format
 msgid "&Style:"
 msgstr ""
 
-#: Merge.rc:1409
+#: Merge.rc:1412
 #, c-format
 msgid "&Copy to Clipboard"
 msgstr ""
 
-#: Merge.rc:1417
+#: Merge.rc:1420
 #, c-format
 msgid "Shared or Private Filter"
 msgstr ""
 
-#: Merge.rc:1420
+#: Merge.rc:1423
 #, c-format
 msgid "Which type of filter do you want to create?"
 msgstr ""
 
-#: Merge.rc:1422
+#: Merge.rc:1425
 #, c-format
 msgid "Shared Filter (for all users on this machine)"
 msgstr ""
 
-#: Merge.rc:1424
+#: Merge.rc:1427
 #, c-format
 msgid "Private Filter (only for current user)"
 msgstr ""
 
-#: Merge.rc:1432
-#: Merge.rc:1901
+#: Merge.rc:1435
+#: Merge.rc:1904
 #, c-format
 msgid "Archive Support"
 msgstr ""
 
-#: Merge.rc:1435
+#: Merge.rc:1438
 #, c-format
 msgid "Archive support requires 7-Zip plugin installed:"
 msgstr ""
 
-#: Merge.rc:1437
+#: Merge.rc:1440
 #, c-format
 msgid "Download 7-zip Plugin"
 msgstr ""
 
-#: Merge.rc:1438
+#: Merge.rc:1441
 #, c-format
 msgid "&Enable archive file support"
 msgstr ""
 
-#: Merge.rc:1440
+#: Merge.rc:1443
 #, c-format
 msgid "&Use stand-alone 7-Zip if available"
 msgstr ""
 
-#: Merge.rc:1443
+#: Merge.rc:1446
 #, c-format
 msgid "U&se local 7-Zip from WinMerge folder"
 msgstr ""
 
-#: Merge.rc:1445
+#: Merge.rc:1448
 #, c-format
 msgid "&Detect archive type from file signature"
 msgstr ""
 
-#: Merge.rc:1453
+#: Merge.rc:1456
 #, c-format
 msgid "Compare Statistics"
 msgstr ""
 
-#: Merge.rc:1456
+#: Merge.rc:1459
 #, c-format
 msgid "Folders:"
 msgstr ""
 
-#: Merge.rc:1457
+#: Merge.rc:1460
 #, c-format
 msgid "Files:"
 msgstr ""
 
-#: Merge.rc:1458
-#: Merge.rc:2268
+#: Merge.rc:1461
+#: Merge.rc:2271
 #, c-format
 msgid "Different"
 msgstr ""
 
-#: Merge.rc:1459
+#: Merge.rc:1462
 #, c-format
 msgid "Text:"
 msgstr ""
 
-#: Merge.rc:1462
-#: Merge.rc:1481
+#: Merge.rc:1465
+#: Merge.rc:1484
 #, c-format
 msgid "Binary:"
 msgstr ""
 
-#: Merge.rc:1465
+#: Merge.rc:1468
 #, c-format
 msgid "Unique"
 msgstr ""
 
-#: Merge.rc:1466
+#: Merge.rc:1469
 #, c-format
 msgid "Left:"
 msgstr ""
 
-#: Merge.rc:1471
+#: Merge.rc:1474
 #, c-format
 msgid "Right:"
 msgstr ""
 
-#: Merge.rc:1476
-#: Merge.rc:2263
+#: Merge.rc:1479
+#: Merge.rc:2266
 #, c-format
 msgid "Identical"
 msgstr ""
 
-#: Merge.rc:1485
+#: Merge.rc:1488
 #, c-format
 msgid "Total:"
 msgstr ""
 
-#: Merge.rc:1490
+#: Merge.rc:1493
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: Merge.rc:1499
+#: Merge.rc:1502
 #, c-format
 msgid "Affects"
 msgstr ""
 
-#: Merge.rc:1502
 #: Merge.rc:1505
+#: Merge.rc:1508
 #, c-format
 msgid "(Affects)"
 msgstr ""
 
-#: Merge.rc:1506
+#: Merge.rc:1509
 #, c-format
 msgid "Select Codepage for"
 msgstr ""
 
-#: Merge.rc:1507
+#: Merge.rc:1510
 #, c-format
 msgid "&File Loading:"
 msgstr ""
 
-#: Merge.rc:1509
 #: Merge.rc:1512
+#: Merge.rc:1515
 #, c-format
 msgid "..."
 msgstr ""
 
-#: Merge.rc:1510
+#: Merge.rc:1513
 #, c-format
 msgid "File &Saving:"
 msgstr ""
 
-#: Merge.rc:1513
+#: Merge.rc:1516
 #, c-format
 msgid "&Use same codepage for both"
 msgstr ""
 
-#: Merge.rc:1516
+#: Merge.rc:1519
 #, c-format
 msgid "&Apply"
 msgstr ""
 
-#: Merge.rc:1517
-#: Merge.rc:1867
+#: Merge.rc:1520
+#: Merge.rc:1870
 #, c-format
 msgid "&Cancel"
 msgstr ""
 
-#: Merge.rc:1522
+#: Merge.rc:1525
 #, c-format
 msgid "Test Filter"
 msgstr ""
 
-#: Merge.rc:1525
+#: Merge.rc:1528
 #, c-format
 msgid "Testing filter ..."
 msgstr ""
 
-#: Merge.rc:1527
+#: Merge.rc:1530
 #, c-format
 msgid "&Enter text to test:"
 msgstr ""
 
-#: Merge.rc:1529
+#: Merge.rc:1532
 #, c-format
 msgid "&Folder Name"
 msgstr ""
 
-#: Merge.rc:1531
+#: Merge.rc:1534
 #, c-format
 msgid "Result:"
 msgstr ""
 
-#: Merge.rc:1535
+#: Merge.rc:1538
 #, c-format
 msgid "&Test"
 msgstr ""
 
-#: Merge.rc:1536
+#: Merge.rc:1539
 #, c-format
 msgid "&Close"
 msgstr ""
 
-#: Merge.rc:1544
+#: Merge.rc:1547
 #, c-format
 msgid "&Use customized text colors"
 msgstr ""
 
-#: Merge.rc:1547
+#: Merge.rc:1550
 #, c-format
 msgid "Custom text colors"
 msgstr ""
 
-#: Merge.rc:1549
+#: Merge.rc:1552
 #, c-format
 msgid "Whitespace:"
 msgstr ""
 
-#: Merge.rc:1550
+#: Merge.rc:1553
 #, c-format
 msgid "Regular text:"
 msgstr ""
 
-#: Merge.rc:1551
+#: Merge.rc:1554
 #, c-format
 msgid "Selection:"
 msgstr ""
 
-#: Merge.rc:1574
+#: Merge.rc:1577
 #, c-format
 msgid "Paths"
 msgstr ""
 
-#: Merge.rc:1580
+#: Merge.rc:1583
 #, c-format
 msgid "R&ead-only"
 msgstr ""
 
-#: Merge.rc:1584
+#: Merge.rc:1587
 #, c-format
 msgid "Re&ad-only"
 msgstr ""
 
-#: Merge.rc:1590
+#: Merge.rc:1593
 #, c-format
 msgid "Open..."
 msgstr ""
 
-#: Merge.rc:1591
+#: Merge.rc:1594
 #, c-format
 msgid "Save..."
 msgstr ""
 
-#: Merge.rc:1596
-#: Merge.rc:1902
+#: Merge.rc:1599
+#: Merge.rc:1905
 #, c-format
 msgid "Backup Files"
 msgstr ""
 
-#: Merge.rc:1599
+#: Merge.rc:1602
 #, c-format
 msgid "Create backup files in:"
 msgstr ""
 
-#: Merge.rc:1604
+#: Merge.rc:1607
 #, c-format
 msgid "Create backup files into:"
 msgstr ""
 
-#: Merge.rc:1605
+#: Merge.rc:1608
 #, c-format
 msgid "&Original file's folder"
 msgstr ""
 
-#: Merge.rc:1607
+#: Merge.rc:1610
 #, c-format
 msgid "&Global backup folder:"
 msgstr ""
 
-#: Merge.rc:1611
+#: Merge.rc:1614
 #, c-format
 msgid "Backup filename:"
 msgstr ""
 
-#: Merge.rc:1612
+#: Merge.rc:1615
 #, c-format
 msgid "&Append .bak -extension"
 msgstr ""
 
-#: Merge.rc:1614
+#: Merge.rc:1617
 #, c-format
 msgid "A&ppend timestamp"
 msgstr ""
 
-#: Merge.rc:1621
+#: Merge.rc:1624
 #, c-format
 msgid "Confirm Copy"
 msgstr ""
 
-#: Merge.rc:1625
+#: Merge.rc:1628
 #, c-format
 msgid "Are you sure you want to copy XXX items?"
 msgstr ""
 
-#: Merge.rc:1627
+#: Merge.rc:1630
 #, c-format
 msgid "From left"
 msgstr ""
 
-#: Merge.rc:1630
+#: Merge.rc:1633
 #, c-format
 msgid "To right"
 msgstr ""
 
-#: Merge.rc:1633
+#: Merge.rc:1636
 #, c-format
 msgid "Yes"
 msgstr ""
 
-#: Merge.rc:1634
+#: Merge.rc:1637
 #, c-format
 msgid "No"
 msgstr ""
 
 #. StringFileInfo.Block
-#: Merge.rc:1659
+#: Merge.rc:1662
 #, c-format
 msgid "040904e4"
 msgstr ""
 
 #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!
-#: Merge.rc:1661
+#: Merge.rc:1664
 #, c-format
 msgid "English translation by developers"
 msgstr ""
 
 #. VarFileInfo.Translation
-#: Merge.rc:1674
+#: Merge.rc:1677
 #, c-format
 msgid "0x409, 1252"
 msgstr ""
 
-#: Merge.rc:1689
+#: Merge.rc:1692
 #, c-format
 msgid "Ready"
 msgstr ""
 
-#: Merge.rc:1695
+#: Merge.rc:1698
 #, c-format
 msgid "EXT"
 msgstr ""
 
-#: Merge.rc:1696
+#: Merge.rc:1699
 #, c-format
 msgid "CAP"
 msgstr ""
 
-#: Merge.rc:1697
+#: Merge.rc:1700
 #, c-format
 msgid "NUM"
 msgstr ""
 
-#: Merge.rc:1698
+#: Merge.rc:1701
 #, c-format
 msgid "SCRL"
 msgstr ""
 
-#: Merge.rc:1699
+#: Merge.rc:1702
 #, c-format
 msgid "OVR"
 msgstr ""
 
-#: Merge.rc:1700
+#: Merge.rc:1703
 #, c-format
 msgid "REC"
 msgstr ""
 
-#: Merge.rc:1706
+#: Merge.rc:1709
 #, c-format
 msgid "Create empty documents\nNew Documents (Ctrl+N)"
 msgstr ""
 
-#: Merge.rc:1707
+#: Merge.rc:1710
 #, c-format
 msgid "Open an existing document\nOpen (Ctrl+O)"
 msgstr ""
 
-#: Merge.rc:1708
+#: Merge.rc:1711
 #, c-format
 msgid "Close the active document\nClose"
 msgstr ""
 
-#: Merge.rc:1709
+#: Merge.rc:1712
 #, c-format
 msgid "Save the active document\nSave (Ctrl+S)"
 msgstr ""
 
-#: Merge.rc:1710
+#: Merge.rc:1713
 #, c-format
 msgid "Save the active document with a new name\nSave As"
 msgstr ""
 
-#: Merge.rc:1711
+#: Merge.rc:1714
 #, c-format
 msgid "Change the printing options\nPage Setup"
 msgstr ""
 
-#: Merge.rc:1712
+#: Merge.rc:1715
 #, c-format
 msgid "Change the printer and printing options\nPrint Setup"
 msgstr ""
 
-#: Merge.rc:1713
+#: Merge.rc:1716
 #, c-format
 msgid "Print the active document\nPrint"
 msgstr ""
 
-#: Merge.rc:1714
+#: Merge.rc:1717
 #, c-format
 msgid "Display full pages\nPrint Preview"
 msgstr ""
 
-#: Merge.rc:1719
+#: Merge.rc:1722
 #, c-format
 msgid "Make all hidden items visible again"
 msgstr ""
 
-#: Merge.rc:1725
+#: Merge.rc:1728
 #, c-format
 msgid "Open project file\nProject file (Ctrl+J)"
 msgstr ""
 
-#: Merge.rc:1726
+#: Merge.rc:1729
 #, c-format
 msgid "Unknown error attempting to open project file"
 msgstr ""
 
-#: Merge.rc:1727
+#: Merge.rc:1730
 #, c-format
 msgid "Unknown error attempting to save project file"
 msgstr ""
 
-#: Merge.rc:1728
+#: Merge.rc:1731
 #, c-format
 msgid "Project File"
 msgstr ""
 
-#: Merge.rc:1729
+#: Merge.rc:1732
 #, c-format
 msgid "Project file successfully loaded."
 msgstr ""
 
-#: Merge.rc:1730
+#: Merge.rc:1733
 #, c-format
 msgid "Project file successfully saved."
 msgstr ""
 
-#: Merge.rc:1731
+#: Merge.rc:1734
 #, c-format
 msgid "Save current paths and options to project file\nSave Project File"
 msgstr ""
 
-#: Merge.rc:1736
+#: Merge.rc:1739
 #, c-format
 msgid "Display program information, version number and copyright\nAbout"
 msgstr ""
 
-#: Merge.rc:1737
+#: Merge.rc:1740
 #, c-format
 msgid "Quit the application; prompts to save documents\nExit"
 msgstr ""
 
-#: Merge.rc:1743
-#: Merge.rc:1744
-#: Merge.rc:1745
 #: Merge.rc:1746
 #: Merge.rc:1747
 #: Merge.rc:1748
@@ -2690,3437 +2694,3445 @@
 #: Merge.rc:1756
 #: Merge.rc:1757
 #: Merge.rc:1758
+#: Merge.rc:1759
+#: Merge.rc:1760
+#: Merge.rc:1761
 #, c-format
 msgid "Open this document"
 msgstr ""
 
-#: Merge.rc:1763
+#: Merge.rc:1766
 #, c-format
 msgid "Switch to the next window pane\nNext Pane"
 msgstr ""
 
-#: Merge.rc:1764
+#: Merge.rc:1767
 #, c-format
 msgid "Switch back to the previous window pane\nPrevious Pane"
 msgstr ""
 
-#: Merge.rc:1770
+#: Merge.rc:1773
 #, c-format
 msgid "Open another window for the active document\nNew Window"
 msgstr ""
 
-#: Merge.rc:1771
+#: Merge.rc:1774
 #, c-format
 msgid "Arrange icons at the bottom of the window\nArrange Icons"
 msgstr ""
 
-#: Merge.rc:1772
+#: Merge.rc:1775
 #, c-format
 msgid "Arrange windows so they overlap\nCascade Windows"
 msgstr ""
 
-#: Merge.rc:1773
+#: Merge.rc:1776
 #, c-format
 msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
 msgstr ""
 
-#: Merge.rc:1774
+#: Merge.rc:1777
 #, c-format
 msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
 msgstr ""
 
-#: Merge.rc:1775
+#: Merge.rc:1778
 #, c-format
 msgid "Split the active window into panes\nSplit"
 msgstr ""
 
-#: Merge.rc:1781
+#: Merge.rc:1784
 #, c-format
 msgid "Erase the selection\nErase"
 msgstr ""
 
-#: Merge.rc:1782
+#: Merge.rc:1785
 #, c-format
 msgid "Erase everything\nErase All"
 msgstr ""
 
-#: Merge.rc:1783
+#: Merge.rc:1786
 #, c-format
 msgid "Copy the selection and put it on the Clipboard\nCopy"
 msgstr ""
 
-#: Merge.rc:1784
+#: Merge.rc:1787
 #, c-format
 msgid "Cut the selection and put it on the Clipboard\nCut"
 msgstr ""
 
-#: Merge.rc:1785
+#: Merge.rc:1788
 #, c-format
 msgid "Find the specified text\nFind"
 msgstr ""
 
-#: Merge.rc:1786
+#: Merge.rc:1789
 #, c-format
 msgid "Insert Clipboard contents\nPaste"
 msgstr ""
 
-#: Merge.rc:1787
+#: Merge.rc:1790
 #, c-format
 msgid "Repeat the last action\nRepeat"
 msgstr ""
 
-#: Merge.rc:1788
+#: Merge.rc:1791
 #, c-format
 msgid "Replace specific text with different text\nReplace"
 msgstr ""
 
-#: Merge.rc:1789
+#: Merge.rc:1792
 #, c-format
 msgid "Select the entire document\nSelect All"
 msgstr ""
 
-#: Merge.rc:1790
+#: Merge.rc:1793
 #, c-format
 msgid "Undo the last action\nUndo (Ctrl+Z)"
 msgstr ""
 
-#: Merge.rc:1791
+#: Merge.rc:1794
 #, c-format
 msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
 msgstr ""
 
-#: Merge.rc:1797
+#: Merge.rc:1800
 #, c-format
 msgid "Show or hide the toolbar\nToggle ToolBar"
 msgstr ""
 
-#: Merge.rc:1798
+#: Merge.rc:1801
 #, c-format
 msgid "Show or hide the status bar\nToggle StatusBar"
 msgstr ""
 
-#: Merge.rc:1799
+#: Merge.rc:1802
 #, c-format
 msgid "Show or hide the tab bar\nToggle TabBar"
 msgstr ""
 
-#: Merge.rc:1800
+#: Merge.rc:1803
 #, c-format
 msgid "Automatically resize panes\nLock Panes"
 msgstr ""
 
-#: Merge.rc:1806
+#: Merge.rc:1809
 #, c-format
 msgid "Change the window size"
 msgstr ""
 
-#: Merge.rc:1807
+#: Merge.rc:1810
 #, c-format
 msgid "Change the window position"
 msgstr ""
 
-#: Merge.rc:1808
+#: Merge.rc:1811
 #, c-format
 msgid "Reduce the window to an icon"
 msgstr ""
 
-#: Merge.rc:1809
+#: Merge.rc:1812
 #, c-format
 msgid "Enlarge the window to full size"
 msgstr ""
 
-#: Merge.rc:1810
+#: Merge.rc:1813
 #, c-format
 msgid "Switch to the next document window"
 msgstr ""
 
-#: Merge.rc:1811
+#: Merge.rc:1814
 #, c-format
 msgid "Switch to the previous document window"
 msgstr ""
 
-#: Merge.rc:1812
+#: Merge.rc:1815
 #, c-format
 msgid "Close the active window and prompts to save the documents"
 msgstr ""
 
-#: Merge.rc:1817
+#: Merge.rc:1820
 #, c-format
 msgid "Restore the window to normal size"
 msgstr ""
 
-#: Merge.rc:1818
+#: Merge.rc:1821
 #, c-format
 msgid "Activate Task List"
 msgstr ""
 
-#: Merge.rc:1819
+#: Merge.rc:1822
 #, c-format
 msgid "Activate this window"
 msgstr ""
 
-#: Merge.rc:1825
+#: Merge.rc:1828
 #, c-format
 msgid "Close print preview mode\nCancel Preview"
 msgstr ""
 
-#: Merge.rc:1832
+#: Merge.rc:1835
 #, c-format
 msgid "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
 msgstr ""
 
-#: Merge.rc:1839
+#: Merge.rc:1842
 #, c-format
 msgid "Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1846
+#: Merge.rc:1849
 #, c-format
 msgid "Press any key"
 msgstr ""
 
-#: Merge.rc:1852
-#: Merge.rc:1853
+#: Merge.rc:1855
+#: Merge.rc:1856
 #, c-format
 msgid "Right click on the path to copy"
 msgstr ""
 
-#: Merge.rc:1859
+#: Merge.rc:1862
 #, c-format
 msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
 msgstr ""
 
-#: Merge.rc:1860
+#: Merge.rc:1863
 #, c-format
 msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
 msgstr ""
 
-#: Merge.rc:1866
+#: Merge.rc:1869
 #, c-format
 msgid "&Ok"
 msgstr ""
 
-#: Merge.rc:1868
+#: Merge.rc:1871
 #, c-format
 msgid "&Abort"
 msgstr ""
 
-#: Merge.rc:1869
+#: Merge.rc:1872
 #, c-format
 msgid "&Retry"
 msgstr ""
 
-#: Merge.rc:1870
+#: Merge.rc:1873
 #, c-format
 msgid "&Ignore"
 msgstr ""
 
-#: Merge.rc:1871
+#: Merge.rc:1874
 #, c-format
 msgid "Ignore &all"
 msgstr ""
 
-#: Merge.rc:1872
+#: Merge.rc:1875
 #, c-format
 msgid "&Yes"
 msgstr ""
 
-#: Merge.rc:1878
+#: Merge.rc:1881
 #, c-format
 msgid "Yes to &all"
 msgstr ""
 
-#: Merge.rc:1879
+#: Merge.rc:1882
 #, c-format
 msgid "&No"
 msgstr ""
 
-#: Merge.rc:1880
+#: Merge.rc:1883
 #, c-format
 msgid "No to a&ll"
 msgstr ""
 
-#: Merge.rc:1881
+#: Merge.rc:1884
 #, c-format
 msgid "&Continue"
 msgstr ""
 
-#: Merge.rc:1882
+#: Merge.rc:1885
 #, c-format
 msgid "&Skip"
 msgstr ""
 
-#: Merge.rc:1883
+#: Merge.rc:1886
 #, c-format
 msgid "Skip &all"
 msgstr ""
 
-#: Merge.rc:1885
+#: Merge.rc:1888
 #, c-format
 msgid "Don't display this &message again."
 msgstr ""
 
-#: Merge.rc:1886
+#: Merge.rc:1889
 #, c-format
 msgid "Don't ask this &question again."
 msgstr ""
 
-#: Merge.rc:1896
+#: Merge.rc:1899
 #, c-format
 msgid "Syntax colors"
 msgstr ""
 
-#: Merge.rc:1897
+#: Merge.rc:1900
 #, c-format
 msgid "Text Colors"
 msgstr ""
 
-#: Merge.rc:1899
+#: Merge.rc:1902
 #, c-format
 msgid "Version Control"
 msgstr ""
 
-#: Merge.rc:1909
+#: Merge.rc:1912
 #, c-format
 msgid "To:"
 msgstr ""
 
-#: Merge.rc:1910
+#: Merge.rc:1913
 #, c-format
 msgid "From left:"
 msgstr ""
 
-#: Merge.rc:1911
+#: Merge.rc:1914
 #, c-format
 msgid "To left:"
 msgstr ""
 
-#: Merge.rc:1912
+#: Merge.rc:1915
 #, c-format
 msgid "From right:"
 msgstr ""
 
-#: Merge.rc:1913
+#: Merge.rc:1916
 #, c-format
 msgid "To right:"
 msgstr ""
 
-#: Merge.rc:1919
+#: Merge.rc:1922
 #, c-format
 msgid "Version %1"
 msgstr ""
 
-#: Merge.rc:1920
+#: Merge.rc:1923
 #, c-format
 msgid "Unicode"
 msgstr ""
 
-#: Merge.rc:1926
+#: Merge.rc:1929
 #, c-format
 msgid "Options (%1)"
 msgstr ""
 
-#: Merge.rc:1927
+#: Merge.rc:1930
 #, c-format
 msgid "All message boxes are now displayed again."
 msgstr ""
 
-#: Merge.rc:1928
+#: Merge.rc:1931
 #, c-format
 msgid "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
 msgstr ""
 
-#: Merge.rc:1929
+#: Merge.rc:1932
 #, c-format
 msgid "The selected font change will not be applied to any currently visible difference windows."
 msgstr ""
 
-#: Merge.rc:1931
+#: Merge.rc:1934
 #, c-format
 msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
 msgstr ""
 
-#: Merge.rc:1933
+#: Merge.rc:1936
 #, c-format
 msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
 msgstr ""
 
-#: Merge.rc:1939
+#: Merge.rc:1942
 #, c-format
 msgid "Open"
 msgstr ""
 
-#: Merge.rc:1940
+#: Merge.rc:1943
 #, c-format
 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1941
+#: Merge.rc:1944
 #, c-format
 msgid "All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1942
+#: Merge.rc:1945
 #, c-format
 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
 msgstr ""
 
-#: Merge.rc:1944
+#: Merge.rc:1947
 #, c-format
 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1950
+#: Merge.rc:1953
 #, c-format
 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1951
+#: Merge.rc:1954
 #, c-format
 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1952
+#: Merge.rc:1955
 #, c-format
 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1958
+#: Merge.rc:1961
 #, c-format
 msgid "Full Contents"
 msgstr ""
 
-#: Merge.rc:1959
+#: Merge.rc:1962
 #, c-format
 msgid "Quick Contents"
 msgstr ""
 
-#: Merge.rc:1960
+#: Merge.rc:1963
 #, c-format
 msgid "Modified Date"
 msgstr ""
 
-#: Merge.rc:1961
+#: Merge.rc:1964
 #, c-format
 msgid "Modified Date and Size"
 msgstr ""
 
-#: Merge.rc:1962
+#: Merge.rc:1965
 #, c-format
 msgid "Size"
 msgstr ""
 
-#: Merge.rc:1968
+#: Merge.rc:1971
 #, c-format
 msgid "Name"
 msgstr ""
 
-#: Merge.rc:1969
+#: Merge.rc:1972
 #, c-format
 msgid "Location"
 msgstr ""
 
-#: Merge.rc:1970
+#: Merge.rc:1973
 #, c-format
 msgid "Filters"
 msgstr ""
 
-#: Merge.rc:1971
+#: Merge.rc:1974
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:1972
+#: Merge.rc:1975
 #, c-format
 msgid "Description"
 msgstr ""
 
-#: Merge.rc:1973
+#: Merge.rc:1976
 #, c-format
 msgid "Select filename for new filter"
 msgstr ""
 
-#: Merge.rc:1974
+#: Merge.rc:1977
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1976
+#: Merge.rc:1979
 #, c-format
 msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
 msgstr ""
 
-#: Merge.rc:1978
+#: Merge.rc:1981
 #, c-format
 msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
 msgstr ""
 
-#: Merge.rc:1980
+#: Merge.rc:1983
 #, c-format
 msgid "User's filter file folder is not defined!\n\nPlease select filter folder in ...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge: [4946] trunk/Src

From: <ki...@us...> - 2008-01-22 22:47:42

Revision: 4946
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4946&view=rev
Author:   kimmov
Date:     2008-01-22 14:47:39 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
PATCH: [ 1877695 ] VS2005 compile problems: avoid use of 'using namespace std;'
 Submitted by Robert Grange

Modified Paths:
--------------
    trunk/Src/FilterList.cpp
    trunk/Src/FilterList.h
    trunk/Src/Languages/English.pot
    trunk/Src/MainFrm.cpp
    trunk/Src/MainFrm.h

Modified: trunk/Src/FilterList.cpp
===================================================================
--- trunk/Src/FilterList.cpp	2008-01-22 17:26:13 UTC (rev 4945)
+++ trunk/Src/FilterList.cpp	2008-01-22 22:47:39 UTC (rev 4946)
@@ -11,8 +11,6 @@
 #include "FilterList.h"
 #include "pcre.h"
 
-using namespace std;
-
 /** 
  * @brief Constructor.
  */

Modified: trunk/Src/FilterList.h
===================================================================
--- trunk/Src/FilterList.h	2008-01-22 17:26:13 UTC (rev 4945)
+++ trunk/Src/FilterList.h	2008-01-22 22:47:39 UTC (rev 4946)
@@ -12,8 +12,6 @@
 #include <vector>
 #include "pcre.h"
 
-using namespace std;
-
 /**
  * @brief Container for one filtering rule / compiled expression.
  * This structure holds compiled regular expression and a original expression
@@ -54,7 +52,7 @@
 	const char * GetLastMatchExpression();
 
 private:
-	vector <filter_item> m_list;
+	std::vector <filter_item> m_list;
 	char * m_lastMatchExpression;
 
 };

Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot	2008-01-22 17:26:13 UTC (rev 4945)
+++ trunk/Src/Languages/English.pot	2008-01-22 22:47:39 UTC (rev 4946)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-01-20 14:26+0000\n"
+"POT-Creation-Date: 2008-01-23 00:47+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <win...@li...>\n"

Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp	2008-01-22 17:26:13 UTC (rev 4945)
+++ trunk/Src/MainFrm.cpp	2008-01-22 22:47:39 UTC (rev 4946)
@@ -89,8 +89,6 @@
 
 static void LoadToolbarImageList(CMainFrame::TOOLBAR_SIZE size, UINT nIDResource, CImageList& ImgList);
 
-using namespace std;
-
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame
 

Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h	2008-01-22 17:26:13 UTC (rev 4945)
+++ trunk/Src/MainFrm.h	2008-01-22 22:47:39 UTC (rev 4946)
@@ -38,8 +38,6 @@
 
 #define BACKUP_FILE_EXT   _T(".bak")
 
-using namespace std;
-
 /**
  * @brief Flags used when opening files
  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4945] trunk/Src/ConflictFileParser.cpp

From: <ki...@us...> - 2008-01-22 17:26:17

Revision: 4945
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4945&view=rev
Author:   kimmov
Date:     2008-01-22 09:26:13 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
PATCH: [ 1875129 ] Resolve conflict files
 Use string constants in code for conflict markers to not confuse parser when parsing this file.

Modified Paths:
--------------
    trunk/Src/ConflictFileParser.cpp

Modified: trunk/Src/ConflictFileParser.cpp
===================================================================
--- trunk/Src/ConflictFileParser.cpp	2008-01-22 16:54:16 UTC (rev 4944)
+++ trunk/Src/ConflictFileParser.cpp	2008-01-22 17:26:13 UTC (rev 4945)
@@ -31,6 +31,14 @@
 #include "UnicodeString.h"
 #include "UniFile.h"
 
+// Note: keep these strings in "wrong" ord so we can resolve this file :)
+/** @brief String separating Mine and Theirs blocks. */
+static const TCHAR Separator[] = _T("=======");
+/** @brief String ending Theirs block (and conflict). */
+static const TCHAR TheirsEnd[] = _T(">>>>>>> ");
+/** @brief String starting Mine block (and conflict). */
+static const TCHAR MineBegin[] = _T("<<<<<<< ");
+
 #include "ConflictFileParser.h"
 
 // Parse a file
@@ -73,7 +81,7 @@
 			// in common section
 		case 0:
 			// search beginning of conflict section
-			pos = line.find(_T("<<<<<<< "));
+			pos = line.find(MineBegin);
 			if (pos == 0)
 			{
 				// working copy section starts
@@ -100,7 +108,7 @@
 			// in working copy section
 		case 1:
 			// search beginning of conflict section
-			pos = line.find(_T("<<<<<<< "));
+			pos = line.find(MineBegin);
 			if (pos == 0)
 			{
 				// nested conflict section starts
@@ -113,7 +121,7 @@
 			}
 			else
 			{
-				pos = line.find(_T("======="));
+				pos = line.find(Separator);
 				if ((pos != std::string::npos) && (pos == (line.length() - 7)))
 				{
 					line = line.substr(0, pos);
@@ -143,7 +151,7 @@
 			// in new revision section
 		case 2:
 			// search beginning of nested conflict section
-			pos = line.find(_T("<<<<<<< "));
+			pos = line.find(MineBegin);
 			if (pos == 0)
 			{
 				// nested conflict section starts
@@ -156,7 +164,7 @@
 			}
 			else
 			{
-				pos = line.find(_T(">>>>>>> "));
+				pos = line.find(TheirsEnd);
 				if (pos != std::string::npos)
 				{
 					revision = line.substr(pos + 8);
@@ -189,14 +197,14 @@
 		case 3:
 			// search beginning of nested conflict section
 			bNestedConflicts = true;
-			pos = line.find(_T("<<<<<<< "));
+			pos = line.find(MineBegin);
 			if (pos == 0)
 			{
 				iNestingLevel++;
 			}
 			else
 			{
-				pos = line.find(_T(">>>>>>> "));
+				pos = line.find(TheirsEnd);
 				if (pos != std::string::npos)
 				{
 					if (iNestingLevel == 0)
@@ -219,14 +227,14 @@
 			// in nested section in new revision section
 		case 4:
 			// search beginning of nested conflict section
-			pos = line.find(_T("<<<<<<< "));
+			pos = line.find(MineBegin);
 			if (pos == 0)
 			{
 				iNestingLevel++;
 			}
 			else
 			{
-				pos = line.find(_T(">>>>>>> "));
+				pos = line.find(TheirsEnd);
 				if (pos != std::string::npos)
 				{
 					if (iNestingLevel == 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4944] trunk/Src

From: <ki...@us...> - 2008-01-22 16:54:18

Revision: 4944
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4944&view=rev
Author:   kimmov
Date:     2008-01-22 08:54:16 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
PATCH: [ 1875129 ] Resolve conflict files
 Set right-side "mine" file as modified after opening it.

Modified Paths:
--------------
    trunk/Src/DirView.cpp
    trunk/Src/MainFrm.cpp
    trunk/Src/MainFrm.h

Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp	2008-01-22 16:37:27 UTC (rev 4943)
+++ trunk/Src/DirView.cpp	2008-01-22 16:54:16 UTC (rev 4944)
@@ -1161,8 +1161,11 @@
 		FileLocation filelocRight(pathRight.c_str());
 		filelocRight.encoding = di2->right.encoding;
 
+		DWORD leftFlags = bLeftRO ? FFILEOPEN_READONLY : 0;
+		DWORD rightFlags = bRightRO ? FFILEOPEN_READONLY : 0;
+
 		int rtn = GetMainFrame()->ShowMergeDoc(pDoc, filelocLeft, filelocRight,
-			bLeftRO, bRightRO, infoUnpacker);
+			leftFlags, rightFlags, infoUnpacker);
 		if (rtn == OPENRESULTS_FAILED_BINARY)
 		{
 			if (di1 == di2)

Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp	2008-01-22 16:37:27 UTC (rev 4943)
+++ trunk/Src/MainFrm.cpp	2008-01-22 16:54:16 UTC (rev 4944)
@@ -640,15 +640,19 @@
 }
 
 /**
- * @brief Creates new MergeDoc instance and shows documents
- *
- * @param cpleft, cpright : left and right codepages
- * = -1 when the file must be parsed
+ * @brief Creates new MergeDoc instance and shows documents.
+ * @param [in] pDirDoc Dir compare document to create a new Merge document for.
+ * @param [in] ifilelocLeft Left side file location info.
+ * @param [in] ifilelocRight Right side file location info.
+ * @param [in] dwLeftFlags Left side flags.
+ * @param [in] dwRightFlags Right side flags.
+ * @param [in] infoUnpacker Plugin info.
  * @return OPENRESULTS_TYPE for success/failure code.
  */
 int CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc,
 	const FileLocation & ifilelocLeft, const FileLocation & ifilelocRight,
-	BOOL bROLeft, BOOL bRORight, PackingInfo * infoUnpacker /*= NULL*/)
+	DWORD dwLeftFlags /*=0*/, DWORD dwRightFlags /*=0*/,
+	PackingInfo * infoUnpacker /*= NULL*/)
 {
 	BOOL docNull;
 	CMergeDoc * pMergeDoc = GetMergeDocToShow(pDirDoc, &docNull);
@@ -725,11 +729,24 @@
 	}
 
 	// Note that OpenDocs() takes care of closing compare window when needed.
+	BOOL bLeftRO = (dwLeftFlags & FFILEOPEN_READONLY) > 0;
+	BOOL bRightRO = (dwRightFlags & FFILEOPEN_READONLY) > 0;
 	OPENRESULTS_TYPE openResults = pMergeDoc->OpenDocs(filelocLeft, filelocRight,
-			bROLeft, bRORight);
+			bLeftRO, bRightRO);
 
 	if (openResults == OPENRESULTS_SUCCESS)
 	{
+		BOOL bLeftModified = (dwLeftFlags & FFILEOPEN_MODIFIED) > 0;
+		BOOL bRightModified = (dwRightFlags & FFILEOPEN_MODIFIED) > 0;
+		if (bLeftModified || bRightModified)
+		{
+			if (bLeftModified)
+				pMergeDoc->m_ptBuf[0]->SetModified(TRUE);
+			if (bRightModified)
+				pMergeDoc->m_ptBuf[1]->SetModified(TRUE);
+			pMergeDoc->UpdateHeaderPath(1);
+		}
+
 		if (docNull)
 		{
 			CWnd* pWnd = pMergeDoc->GetParentFrame();
@@ -1009,7 +1026,15 @@
 }
 
 /**
- * @brief Begin a diff: open dirdoc if it is directories, else open a mergedoc for editing
+ * @brief Begin a diff: open dirdoc if it is directories, else open a mergedoc for editing.
+ * @param [in] pszLeft Left-side path.
+ * @param [in] pszRight Right-side path.
+ * @param [in] dwLeftFlags Left-side flags.
+ * @param [in] dwRightFlags Right-side flags.
+ * @param [in] bRecurse Do we run recursive (folder) compare?
+ * @param [in] pDirDoc Dir compare document to use.
+ * @param [in] prediffer Prediffer plugin name.
+ * @return TRUE if opening files and compare succeeded, FALSE otherwise.
  */
 BOOL CMainFrame::DoFileOpen(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*/,
 	DWORD dwLeftFlags /*=0*/, DWORD dwRightFlags /*=0*/, BOOL bRecurse /*=FALSE*/, CDirDoc *pDirDoc/*=NULL*/,
@@ -1236,7 +1261,7 @@
 			pDirDoc->SetPluginPrediffer(strBothFilenames, prediffer);
 		}
 
-		ShowMergeDoc(pDirDoc, filelocLeft, filelocRight, bROLeft, bRORight,
+		ShowMergeDoc(pDirDoc, filelocLeft, filelocRight, dwLeftFlags, dwRightFlags,
 			&infoUnpacker);
 	}
 	return TRUE;
@@ -2529,7 +2554,7 @@
 	m_strDescriptions[1] = theApp.LoadString(IDS_EMPTY_RIGHT_FILE);
 	FileLocation filelocLeft; // empty, unspecified (so default) encoding
 	FileLocation filelocRight;
-	ShowMergeDoc(pDirDoc, filelocLeft, filelocRight, FALSE, FALSE);
+	ShowMergeDoc(pDirDoc, filelocLeft, filelocRight);
 
 	// Empty descriptors now that docs are open
 	m_strDescriptions[0].erase();
@@ -3452,6 +3477,11 @@
  * This function lets user to select conflict file to resolve.
  * Then we parse conflict file to two files to "merge" and
  * save resulting file over original file.
+ *
+ * Set left-side file read-only as it is the repository file which cannot
+ * be modified anyway. Right-side file is user's file which is set as
+ * modified by default so user can just save it and accept workspace
+ * file as resolved file.
  */
 void CMainFrame::OnFileOpenConflict()
 {
@@ -3482,8 +3512,10 @@
 			String my = LoadResString(IDS_CONFLICT_MINE_FILE);
 			m_strDescriptions[0] = theirs;
 			m_strDescriptions[1] = my;
+
 			DoFileOpen(revFile.c_str(), workFile.c_str(),
-					FFILEOPEN_READONLY |FFILEOPEN_NOMRU, FFILEOPEN_NOMRU );
+					FFILEOPEN_READONLY | FFILEOPEN_NOMRU,
+					FFILEOPEN_NOMRU | FFILEOPEN_MODIFIED);
 		}
 		else
 		{

Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h	2008-01-22 16:37:27 UTC (rev 4943)
+++ trunk/Src/MainFrm.h	2008-01-22 16:54:16 UTC (rev 4944)
@@ -48,6 +48,7 @@
 	FFILEOPEN_NONE		= 0x0000,
 	FFILEOPEN_NOMRU		= 0x0001, /**< Do not add this path to MRU list */
 	FFILEOPEN_READONLY	= 0x0002, /**< Open this path as read-only */
+	FFILEOPEN_MODIFIED  = 0x0004, /**< Mark file modified after opening. */
 	FFILEOPEN_CMDLINE	= 0x0010, /**< Path is read from commandline */
 	FFILEOPEN_PROJECT	= 0x0020, /**< Path is read from project-file */
 };
@@ -116,7 +117,8 @@
 	BOOL DoFileOpen(LPCTSTR pszLeft = NULL, LPCTSTR pszRight = NULL,
 		DWORD dwLeftFlags = 0, DWORD dwRightFlags = 0, BOOL bRecurse = FALSE, CDirDoc *pDirDoc = NULL, CString prediffer = _T(""));
 	int ShowMergeDoc(CDirDoc * pDirDoc, const FileLocation & filelocLeft,
-		const FileLocation & filelocRight, BOOL bROLeft, BOOL bRORight, PackingInfo * infoUnpacker = NULL);
+		const FileLocation & filelocRight, DWORD dwLeftFlags = 0,
+		DWORD dwRightFlags = 0, PackingInfo * infoUnpacker = NULL);
 	void UpdateResources();
 	BOOL CreateBackup(BOOL bFolder, LPCTSTR pszPath);
 	int HandleReadonlySave(CString& strSavePath, BOOL bMultiFile, BOOL &bApplyToAll);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4943] trunk/Src/TempFile.cpp

From: <ki...@us...> - 2008-01-22 16:37:40

Revision: 4943
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4943&view=rev
Author:   kimmov
Date:     2008-01-22 08:37:27 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
PATCH: [ 1874047 ] Simpler temp file class
 Bugfix from Takashi for scratchpads failing to open.

Modified Paths:
--------------
    trunk/Src/TempFile.cpp

Modified: trunk/Src/TempFile.cpp
===================================================================
--- trunk/Src/TempFile.cpp	2008-01-22 14:51:23 UTC (rev 4942)
+++ trunk/Src/TempFile.cpp	2008-01-22 16:37:27 UTC (rev 4943)
@@ -77,10 +77,11 @@
 	temp = env_GetTempFileName(temp.c_str(), pref.c_str(), NULL);
 	if (!temp.empty())
 	{
+		// Scratchpads don't have a file to copy.
+		m_path = temp;
 		if (::CopyFile(filepath, temp.c_str(), FALSE))
 		{
 			::SetFileAttributes(temp.c_str(), FILE_ATTRIBUTE_NORMAL);
-			m_path = temp;
 		}
 	}
 	return temp;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4942] trunk/Docs/Users/Manual/WinMerge_help.xml

From: <ki...@us...> - 2008-01-22 14:51:24

Revision: 4942
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4942&view=rev
Author:   kimmov
Date:     2008-01-22 06:51:23 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
Manual: Bump revision number to 1.3.10.

Modified Paths:
--------------
    trunk/Docs/Users/Manual/WinMerge_help.xml

Modified: trunk/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- trunk/Docs/Users/Manual/WinMerge_help.xml	2008-01-22 14:49:49 UTC (rev 4941)
+++ trunk/Docs/Users/Manual/WinMerge_help.xml	2008-01-22 14:51:23 UTC (rev 4942)
@@ -25,7 +25,7 @@
 
     <productname>WinMerge</productname>
 
-    <releaseinfo><emphasis>Revision 1.3.9</emphasis></releaseinfo>
+    <releaseinfo><emphasis>Revision 1.3.10</emphasis></releaseinfo>
 
     <copyright>
       <year>2004-2008</year>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4941] trunk/Docs/Users

From: <ki...@us...> - 2008-01-22 14:49:52

Revision: 4941
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4941&view=rev
Author:   kimmov
Date:     2008-01-22 06:49:49 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
PATCH: [ 1876770 ] Manual: Add conflict file resolving section

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/Compare_files.xml

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-22 14:31:47 UTC (rev 4940)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-22 14:49:49 UTC (rev 4941)
@@ -5,6 +5,7 @@
 WinMerge 2.7.7.3
   Resolve conflict files (cvs, svn...) (#1875129)
   Save line filter when edit box loses focus (#1875853)
+  Manual: Add instructions for conflict file resolving (#1876770)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)
 

Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml	2008-01-22 14:31:47 UTC (rev 4940)
+++ trunk/Docs/Users/Manual/Compare_files.xml	2008-01-22 14:49:49 UTC (rev 4941)
@@ -544,4 +544,68 @@
       </listitem>
     </itemizedlist>
   </sect2>
+
+  <sect2>
+    <title><indexterm>
+        <primary>Conflict Files</primary>
+      </indexterm>Resolving Conflict Files</title>
+
+    <para>WinMerge can resolve conflict files several version control systems
+    produce when merging files. Conflict file is basically two different
+    versions of files embedded into one file. WinMerge reads this file and
+    separates it into its original files, and shows those files in file
+    compare. So conflicted file can be resolved using normal WinMerge file
+    compare functionality.</para>
+
+    <sect3>
+      <title>Opening Conflict Files</title>
+
+      <para>Conflict files can be opened into WinMerge using <menuchoice>
+          <guimenu>File</guimenu>
+
+          <guimenuitem>Open Conflict File...</guimenuitem>
+        </menuchoice>. Conflict file to resolve can be selected using file
+      selection dialog that opens. At the moment there are no other ways to
+      open conflict files.</para>
+
+      <warning>
+        <para>WinMerge overwrites original conflict file. If original file is
+        wanted to save, it must be copied to another folder or another
+        filename before opening it into WinMerge.</para>
+      </warning>
+    </sect3>
+
+    <sect3>
+      <title>Conflict Resolving</title>
+
+      <para>WinMerge opens conflict file into normal file compare (see above).
+      All normal WinMerge file compare features are in use. Files in two
+      panels are:</para>
+
+      <simplelist>
+        <member><emphasis>Left panel</emphasis>: this file is called
+        "<emphasis>theirs</emphasis>" file. It is usually the file that is in
+        version control system's repository. This file usually cannot be
+        edited. An as such, WinMerge opens left-side file as read-only.
+        Differences can be moved only from this file to the another
+        file.</member>
+
+        <member><emphasis>Right panel</emphasis>: this file is called
+        "<emphasis>mine</emphasis>" file. It is the user's working file
+        originally. All changes should be done to this file. I.e. this file is
+        at the same time the result file.</member>
+      </simplelist>
+
+      <para>After the wanted resolved file is in right-side panel, it can be
+      saved like normal file. WinMerge saves the file over original
+      file.</para>
+
+      <para>Left side "<emphasis>mine</emphasis>" file is set to modified
+      after opening conflict file. This allows fast resolve by just saving the
+      file when user's file is the wanted end result. This also prevents
+      accidentally not resolving the files. As resolving only happens when
+      file is saved. If file is no saved, original conflict file is kept
+      unmodified.</para>
+    </sect3>
+  </sect2>
 </sect1>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4940] trunk/Src/MainFrm.cpp

From: <ki...@us...> - 2008-01-22 14:31:51

Revision: 4940
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4940&view=rev
Author:   kimmov
Date:     2008-01-22 06:31:47 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
Fix a bug that after parsing conflict file resulting files were opened to wrong sides in GUI. Bug found and original fix from Takashi, modified by Kimmo.

Modified Paths:
--------------
    trunk/Src/MainFrm.cpp

Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp	2008-01-22 14:26:00 UTC (rev 4939)
+++ trunk/Src/MainFrm.cpp	2008-01-22 14:31:47 UTC (rev 4940)
@@ -3482,7 +3482,7 @@
 			String my = LoadResString(IDS_CONFLICT_MINE_FILE);
 			m_strDescriptions[0] = theirs;
 			m_strDescriptions[1] = my;
-			DoFileOpen(workFile.c_str(), revFile.c_str(), 
+			DoFileOpen(revFile.c_str(), workFile.c_str(),
 					FFILEOPEN_READONLY |FFILEOPEN_NOMRU, FFILEOPEN_NOMRU );
 		}
 		else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4939] trunk/Src/ConflictFileParser.cpp

From: <ki...@us...> - 2008-01-22 14:26:02

Revision: 4939
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4939&view=rev
Author:   kimmov
Date:     2008-01-22 06:26:00 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
Fix a bug in ConflictFileParser - it created extra EOL chars as it opened files in text mode. Fixed by opening files as binary. Fix from Takashi.

Modified Paths:
--------------
    trunk/Src/ConflictFileParser.cpp

Modified: trunk/Src/ConflictFileParser.cpp
===================================================================
--- trunk/Src/ConflictFileParser.cpp	2008-01-22 13:54:38 UTC (rev 4938)
+++ trunk/Src/ConflictFileParser.cpp	2008-01-22 14:26:00 UTC (rev 4939)
@@ -56,8 +56,8 @@
 	BOOL success = conflictFile.OpenReadOnly(conflictFileName.c_str());
 
 	// Create output files
-	BOOL success2 = workingCopy.Open(workingCopyFileName.c_str(), _T("w"));
-	BOOL success3 = newRevision.Open(newRevisionFileName.c_str(), _T("w"));
+	BOOL success2 = workingCopy.Open(workingCopyFileName.c_str(), _T("wb"));
+	BOOL success3 = newRevision.Open(newRevisionFileName.c_str(), _T("wb"));
 
 	state = 0;
 	BOOL linesToRead = TRUE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4938] trunk/Src/Common

From: <ki...@us...> - 2008-01-22 13:54:40

Revision: 4938
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4938&view=rev
Author:   kimmov
Date:     2008-01-22 05:54:38 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
Fix VC6 build by renaming 'map' function argument to disp_map (VC6 thought map was actually std::map typename). 

Modified Paths:
--------------
    trunk/Src/Common/lwdisp.c
    trunk/Src/Common/lwdisp.h

Modified: trunk/Src/Common/lwdisp.c
===================================================================
--- trunk/Src/Common/lwdisp.c	2008-01-21 14:15:41 UTC (rev 4937)
+++ trunk/Src/Common/lwdisp.c	2008-01-22 13:54:38 UTC (rev 4938)
@@ -35,9 +35,10 @@
 2003/11/06	NOBODY@ALL			incredible number of changes for unknown reasons
 2003/11/18	Laoran				CreateDispatchBySource : avoid crash if loading dll fails
 2003/11/18	Laoran				CreateDispatchBySource, cosmetic : move dll load&object creation after the CLSID search (= less indentations)
-2004/01/08      Perry                           Updated function comment preceding ReportError 
+2004/01/08  Perry               Updated function comment preceding ReportError
+2008/01/22  Kimmo               Changed map argument name to disp_map to not confuse VC6
 */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 //#define _WIN32_IE		0x0300
@@ -564,7 +565,7 @@
 	return &vtbl;
 }
 
-IDispatch *NTAPI LWDispatch(void *target, const void *map,
+IDispatch *NTAPI LWDispatch(void *target, const void *disp_map,
 	const struct LWDispVtbl *lpVtbl, struct LWDispatch *This)
 {
 	if (lpVtbl == 0)
@@ -573,7 +574,7 @@
 		This = (struct LWDispatch *)malloc(sizeof(*This));
 	This->lpVtbl = lpVtbl;
 	This->target = target;
-	This->map = (const struct LWDispMap *)map;
+	This->map = (const struct LWDispMap *)disp_map;
 	This->refc = 0;
 	return (IDispatch *)This;
 }

Modified: trunk/Src/Common/lwdisp.h
===================================================================
--- trunk/Src/Common/lwdisp.h	2008-01-21 14:15:41 UTC (rev 4937)
+++ trunk/Src/Common/lwdisp.h	2008-01-22 13:54:38 UTC (rev 4938)
@@ -22,7 +22,7 @@
 ==========	==================	================================================
 2003/11/28	Laoran 				      header and RCS ID
 */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef __LWDISP_H__
@@ -219,7 +219,7 @@
 
 const struct LWDispVtbl *NTAPI LWDispSubclass(struct LWDispVtbl *);
 
-IDispatch *NTAPI LWDispatch(void *target, const void *map,
+IDispatch *NTAPI LWDispatch(void *target, const void *disp_map,
 							const struct LWDispVtbl *, struct LWDispatch *);
 
 // functions to build VARIANT arguments from various data types


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4937] trunk

From: <ki...@us...> - 2008-01-21 14:15:47

Revision: 4937
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4937&view=rev
Author:   kimmov
Date:     2008-01-21 06:15:41 -0800 (Mon, 21 Jan 2008)

Log Message:
-----------
PATCH: [ 1875853 ] Save modified linefilter when editbox loses focus

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/PropLineFilter.cpp
    trunk/Src/PropLineFilter.h

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-20 12:51:10 UTC (rev 4936)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-21 14:15:41 UTC (rev 4937)
@@ -4,6 +4,7 @@
 
 WinMerge 2.7.7.3
   Resolve conflict files (cvs, svn...) (#1875129)
+  Save line filter when edit box loses focus (#1875853)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)
 

Modified: trunk/Src/PropLineFilter.cpp
===================================================================
--- trunk/Src/PropLineFilter.cpp	2008-01-20 12:51:10 UTC (rev 4936)
+++ trunk/Src/PropLineFilter.cpp	2008-01-21 14:15:41 UTC (rev 4937)
@@ -66,6 +66,7 @@
 	ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedLfilterRemovebtn)
 	ON_BN_CLICKED(IDC_LFILTER_EDITSAVE, OnBnClickedLfilterEditsave)
 	ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList)
+	ON_EN_KILLFOCUS(IDC_LFILTER_EDITBOX, OnEnKillfocusLfilterEditbox)
 END_MESSAGE_MAP()
 
 
@@ -247,19 +248,7 @@
  */
 void CPropLineFilter::OnBnClickedLfilterEditsave()
 {
-	ASSERT(m_bEditing);
-
-	int sel =- 1;
-	sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
-	if (sel != -1)
-	{
-		CString text;
-		m_editRegexp.GetWindowText(text);
-		m_filtersList.SetItemText(sel, 0, text);
-	}
-	m_bEditing = FALSE;
-	m_editRegexp.SetReadOnly(TRUE);
-	m_saveRegexp.EnableWindow(FALSE);
+	SaveItem();
 }
 
 /**
@@ -299,3 +288,32 @@
 	m_editRegexp.SetWindowText(text);
 	*pResult = 0;
 }
+
+/**
+ * @brief Save the current filter in edit box.
+ */
+void CPropLineFilter::SaveItem()
+{
+	if (m_bEditing)
+	{
+		int sel =- 1;
+		sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+		if (sel != -1)
+		{
+			CString text;
+			m_editRegexp.GetWindowText(text);
+			m_filtersList.SetItemText(sel, 0, text);
+		}
+		m_bEditing = FALSE;
+		m_editRegexp.SetReadOnly(TRUE);
+		m_saveRegexp.EnableWindow(FALSE);
+	}
+}
+
+/**
+ * @brief Called when filter edit box loses its focus.
+ */
+void CPropLineFilter::OnEnKillfocusLfilterEditbox()
+{
+	SaveItem();
+}

Modified: trunk/Src/PropLineFilter.h
===================================================================
--- trunk/Src/PropLineFilter.h	2008-01-20 12:51:10 UTC (rev 4936)
+++ trunk/Src/PropLineFilter.h	2008-01-21 14:15:41 UTC (rev 4937)
@@ -1,11 +1,3 @@
-// PropLineFilter.h : header file
-//
-
-#include "afxcmn.h"
-#include "afxwin.h"
-#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
-#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
-
 /** 
  * @file  PropLineFilter.h
  *
@@ -15,6 +7,11 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
+#include "afxcmn.h"
+#include "afxwin.h"
+#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
+#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
+
 class LineFiltersList;
 
 /// Class for Line filter propertypage
@@ -59,12 +56,14 @@
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	afx_msg void OnBnClickedLfilterEditsave();
 	afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnEnKillfocusLfilterEditbox();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
 	void InitList();
 	int AddRow(LPCTSTR filter = NULL, BOOL enabled = FALSE);
 	void EditSelectedFilter();
+	void SaveItem();
 
 private:
 	CListCtrl m_filtersList; /**< List control having filter strings */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4936] trunk/Docs/Users/Contributors.txt

From: <ki...@us...> - 2008-01-20 12:51:18

Revision: 4936
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4936&view=rev
Author:   kimmov
Date:     2008-01-20 04:51:10 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
Docs: Add Francis Irving to contributors as author of original conflict file parser I converted for WinMerge.

Modified Paths:
--------------
    trunk/Docs/Users/Contributors.txt

Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt	2008-01-20 12:35:07 UTC (rev 4935)
+++ trunk/Docs/Users/Contributors.txt	2008-01-20 12:51:10 UTC (rev 4936)
@@ -143,6 +143,7 @@
 * Brent Corkum (BCMenu)
 * Paul DiLascia (CStaticLink) 
 * Michael Dunn (CShellFileOp)
+* Francis Irving (original conflict file parser)
 * Michael P. Mehl (CMessageBoxDialog)
 * Cristi Posea (CSizingControlBar)
 * Ferdinand Prantl (CrystalEditor syntax rules)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4935] trunk/Src/Languages

From: <ki...@us...> - 2008-01-20 12:35:12

Revision: 4935
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4935&view=rev
Author:   kimmov
Date:     2008-01-20 04:35:07 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
PATCH: [ 1875129 ] Resolve conflict files
 Update English.pot and all PO files.

Modified Paths:
--------------
    trunk/Src/Languages/Brazilian.po
    trunk/Src/Languages/Bulgarian.po
    trunk/Src/Languages/Catalan.po
    trunk/Src/Languages/ChineseSimplified.po
    trunk/Src/Languages/ChineseTraditional.po
    trunk/Src/Languages/Croatian.po
    trunk/Src/Languages/Czech.po
    trunk/Src/Languages/Danish.po
    trunk/Src/Languages/Dutch.po
    trunk/Src/Languages/English.pot
    trunk/Src/Languages/French.po
    trunk/Src/Languages/German.po
    trunk/Src/Languages/Hungarian.po
    trunk/Src/Languages/Italian.po
    trunk/Src/Languages/Japanese.po
    trunk/Src/Languages/Korean.po
    trunk/Src/Languages/Norwegian.po
    trunk/Src/Languages/Polish.po
    trunk/Src/Languages/Portuguese.po
    trunk/Src/Languages/Russian.po
    trunk/Src/Languages/Slovak.po
    trunk/Src/Languages/Spanish.po
    trunk/Src/Languages/Swedish.po
    trunk/Src/Languages/Turkish.po

Modified: trunk/Src/Languages/Brazilian.po
===================================================================
--- trunk/Src/Languages/Brazilian.po	2008-01-20 12:32:14 UTC (rev 4934)
+++ trunk/Src/Languages/Brazilian.po	2008-01-20 12:35:07 UTC (rev 4935)
@@ -71,7 +71,7 @@
 
 #: Merge.rc:81
 #: Merge.rc:103
-#: Merge.rc:494
+#: Merge.rc:495
 #, c-format
 msgid "&Copy"
 msgstr "&Copiar"
@@ -83,7 +83,7 @@
 msgstr "Co&lar"
 
 #: Merge.rc:84
-#: Merge.rc:575
+#: Merge.rc:576
 #, c-format
 msgid "&Goto..."
 msgstr ""
@@ -94,2507 +94,2512 @@
 msgstr ""
 
 #: Merge.rc:88
-#: Merge.rc:517
-#: Merge.rc:523
+#: Merge.rc:518
+#: Merge.rc:524
 #, c-format
 msgid "with &Registered Application"
 msgstr ""
 
 #: Merge.rc:89
-#: Merge.rc:518
-#: Merge.rc:524
+#: Merge.rc:519
+#: Merge.rc:525
 #, c-format
 msgid "with &External Editor"
 msgstr ""
 
 #: Merge.rc:90
-#: Merge.rc:519
-#: Merge.rc:525
+#: Merge.rc:520
+#: Merge.rc:526
 #, c-format
 msgid "&with..."
 msgstr ""
 
 #: Merge.rc:110
-#: Merge.rc:189
-#: Merge.rc:304
+#: Merge.rc:190
+#: Merge.rc:305
 #, c-format
 msgid "&File"
 msgstr "&Arquivo"
 
 #: Merge.rc:112
-#: Merge.rc:191
-#: Merge.rc:306
+#: Merge.rc:192
+#: Merge.rc:307
 #, c-format
 msgid "&New\tCtrl+N"
 msgstr "New\tCtrl+N"
 
 #: Merge.rc:113
-#: Merge.rc:192
-#: Merge.rc:307
+#: Merge.rc:193
+#: Merge.rc:308
 #, c-format
 msgid "&Open...\tCtrl+O"
 msgstr "&Abrir...\tCtrl+O"
 
-#: Merge.rc:115
+#: Merge.rc:114
 #, c-format
-msgid "Open Project...\tCtrl+J"
+msgid "Op&en Conflict File..."
 msgstr ""
 
 #: Merge.rc:116
-#: Merge.rc:195
-#: Merge.rc:310
 #, c-format
+msgid "Open Project...\tCtrl+J"
+msgstr ""
+
+#: Merge.rc:117
+#: Merge.rc:196
+#: Merge.rc:311
+#, c-format
 msgid "Sa&ve Project..."
 msgstr ""
 
-#: Merge.rc:118
+#: Merge.rc:119
 #, c-format
 msgid "Recent Projects"
 msgstr ""
 
-#: Merge.rc:120
-#: Merge.rc:202
-#: Merge.rc:342
+#: Merge.rc:121
+#: Merge.rc:203
+#: Merge.rc:343
 #, c-format
 msgid "E&xit"
 msgstr "&Sair"
 
-#: Merge.rc:122
-#: Merge.rc:204
-#: Merge.rc:344
+#: Merge.rc:123
+#: Merge.rc:205
+#: Merge.rc:345
 #, c-format
 msgid "&Edit"
 msgstr "&Editar"
 
-#: Merge.rc:124
-#: Merge.rc:208
-#: Merge.rc:378
+#: Merge.rc:125
+#: Merge.rc:209
+#: Merge.rc:379
 #, c-format
 msgid "&Options..."
 msgstr "Op\xE7\xF5e&s..."
 
-#: Merge.rc:126
-#: Merge.rc:210
-#: Merge.rc:380
+#: Merge.rc:127
+#: Merge.rc:211
+#: Merge.rc:381
 #, c-format
 msgid "&View"
 msgstr "E&xibir"
 
-#: Merge.rc:128
-#: Merge.rc:221
-#: Merge.rc:382
+#: Merge.rc:129
+#: Merge.rc:222
+#: Merge.rc:383
 #, c-format
 msgid "Select &Font..."
 msgstr "Escolher &Fonte..."
 
-#: Merge.rc:129
-#: Merge.rc:222
-#: Merge.rc:383
+#: Merge.rc:130
+#: Merge.rc:223
+#: Merge.rc:384
 #, c-format
 msgid "Use Default F&ont"
 msgstr "Usar F&onte Padr\xE3o"
 
-#: Merge.rc:131
-#: Merge.rc:224
-#: Merge.rc:400
+#: Merge.rc:132
+#: Merge.rc:225
+#: Merge.rc:401
 #, c-format
 msgid "&Toolbar"
 msgstr ""
 
-#: Merge.rc:133
-#: Merge.rc:226
-#: Merge.rc:402
-#, c-format
-msgid "&None"
-msgstr ""
-
 #: Merge.rc:134
 #: Merge.rc:227
 #: Merge.rc:403
 #, c-format
-msgid "&Small"
+msgid "&None"
 msgstr ""
 
 #: Merge.rc:135
 #: Merge.rc:228
 #: Merge.rc:404
 #, c-format
-msgid "&Big"
+msgid "&Small"
 msgstr ""
 
-#: Merge.rc:137
-#: Merge.rc:230
-#: Merge.rc:406
+#: Merge.rc:136
+#: Merge.rc:229
+#: Merge.rc:405
 #, c-format
-msgid "&Status Bar"
-msgstr "Barra de &Status"
+msgid "&Big"
+msgstr ""
 
 #: Merge.rc:138
 #: Merge.rc:231
 #: Merge.rc:407
 #, c-format
+msgid "&Status Bar"
+msgstr "Barra de &Status"
+
+#: Merge.rc:139
+#: Merge.rc:232
+#: Merge.rc:408
+#, c-format
 msgid "Ta&b Bar"
 msgstr ""
 
-#: Merge.rc:140
-#: Merge.rc:234
-#: Merge.rc:411
+#: Merge.rc:141
+#: Merge.rc:235
+#: Merge.rc:412
 #, c-format
 msgid "&Language..."
 msgstr "&Idioma..."
 
-#: Merge.rc:142
-#: Merge.rc:255
-#: Merge.rc:433
+#: Merge.rc:143
+#: Merge.rc:256
+#: Merge.rc:434
 #, c-format
 msgid "&Tools"
 msgstr ""
 
-#: Merge.rc:144
-#: Merge.rc:258
-#: Merge.rc:435
+#: Merge.rc:145
+#: Merge.rc:259
+#: Merge.rc:436
 #, c-format
 msgid "&Filters..."
 msgstr ""
 
-#: Merge.rc:145
-#: Merge.rc:259
-#: Merge.rc:436
+#: Merge.rc:146
+#: Merge.rc:260
+#: Merge.rc:437
 #, c-format
 msgid "&Generate Patch..."
 msgstr ""
 
-#: Merge.rc:147
-#: Merge.rc:262
-#: Merge.rc:439
+#: Merge.rc:148
+#: Merge.rc:263
+#: Merge.rc:440
 #, c-format
 msgid "&Plugins"
 msgstr ""
 
-#: Merge.rc:149
-#: Merge.rc:264
-#: Merge.rc:441
+#: Merge.rc:150
+#: Merge.rc:265
+#: Merge.rc:442
 #, c-format
 msgid "&Manual Unpacking"
 msgstr ""
 
-#: Merge.rc:150
-#: Merge.rc:265
-#: Merge.rc:442
+#: Merge.rc:151
+#: Merge.rc:266
+#: Merge.rc:443
 #, c-format
 msgid "&Automatic Unpacking"
 msgstr ""
 
-#: Merge.rc:152
-#: Merge.rc:267
-#: Merge.rc:444
+#: Merge.rc:153
+#: Merge.rc:268
+#: Merge.rc:445
 #, c-format
 msgid "&Edit with Unpacker"
 msgstr ""
 
-#: Merge.rc:154
-#: Merge.rc:269
-#: Merge.rc:451
+#: Merge.rc:155
+#: Merge.rc:270
+#: Merge.rc:452
 #, c-format
 msgid "&Reload plugins"
 msgstr ""
 
-#: Merge.rc:156
-#: Merge.rc:271
-#: Merge.rc:453
+#: Merge.rc:157
+#: Merge.rc:272
+#: Merge.rc:454
 #, c-format
 msgid "&Debug"
 msgstr ""
 
-#: Merge.rc:158
-#: Merge.rc:273
-#: Merge.rc:455
+#: Merge.rc:159
+#: Merge.rc:274
+#: Merge.rc:456
 #, c-format
 msgid "&Load Config..."
 msgstr ""
 
-#: Merge.rc:159
-#: Merge.rc:274
-#: Merge.rc:456
+#: Merge.rc:160
+#: Merge.rc:275
+#: Merge.rc:457
 #, c-format
 msgid "&Reset Options"
 msgstr ""
 
-#: Merge.rc:161
-#: Merge.rc:276
-#: Merge.rc:458
+#: Merge.rc:162
+#: Merge.rc:277
+#: Merge.rc:459
 #, c-format
 msgid "&Window"
 msgstr "Ja&nela"
 
-#: Merge.rc:163
-#: Merge.rc:278
-#: Merge.rc:460
+#: Merge.rc:164
+#: Merge.rc:279
+#: Merge.rc:461
 #, c-format
 msgid "Cl&ose"
 msgstr "Fechar"
 
-#: Merge.rc:164
-#: Merge.rc:279
-#: Merge.rc:461
+#: Merge.rc:165
+#: Merge.rc:280
+#: Merge.rc:462
 #, c-format
 msgid "Clo&se All"
 msgstr ""
 
-#: Merge.rc:166
-#: Merge.rc:281
-#: Merge.rc:463
+#: Merge.rc:167
+#: Merge.rc:282
+#: Merge.rc:464
 #, c-format
 msgid "Change &Pane\tF6"
 msgstr ""
 
-#: Merge.rc:168
-#: Merge.rc:283
-#: Merge.rc:465
-#, c-format
-msgid "Tile &Horizontally"
-msgstr "Dividir &Horizontalmente"
-
 #: Merge.rc:169
 #: Merge.rc:284
 #: Merge.rc:466
 #, c-format
-msgid "Tile &Vertically"
-msgstr "Dividir &Verticalmente"
+msgid "Tile &Horizontally"
+msgstr "Dividir &Horizontalmente"
 
 #: Merge.rc:170
 #: Merge.rc:285
 #: Merge.rc:467
 #, c-format
+msgid "Tile &Vertically"
+msgstr "Dividir &Verticalmente"
+
+#: Merge.rc:171
+#: Merge.rc:286
+#: Merge.rc:468
+#, c-format
 msgid "&Cascade"
 msgstr "Em &Cascata"
 
-#: Merge.rc:172
-#: Merge.rc:287
-#: Merge.rc:469
-#: Merge.rc:1883
+#: Merge.rc:173
+#: Merge.rc:288
+#: Merge.rc:470
+#: Merge.rc:1884
 #, c-format
 msgid "&Help"
 msgstr "A&juda"
 
-#: Merge.rc:174
-#: Merge.rc:289
-#: Merge.rc:471
-#, c-format
-msgid "&Contents...\tF1"
-msgstr "&Conte\xFAdo...\tF1"
-
 #: Merge.rc:175
 #: Merge.rc:290
 #: Merge.rc:472
 #, c-format
-msgid "&Index..."
-msgstr ""
+msgid "&Contents...\tF1"
+msgstr "&Conte\xFAdo...\tF1"
 
 #: Merge.rc:176
 #: Merge.rc:291
 #: Merge.rc:473
 #, c-format
-msgid "&Search..."
+msgid "&Index..."
 msgstr ""
 
-#: Merge.rc:178
-#: Merge.rc:293
-#: Merge.rc:475
+#: Merge.rc:177
+#: Merge.rc:292
+#: Merge.rc:474
 #, c-format
-msgid "R&elease Notes"
+msgid "&Search..."
 msgstr ""
 
 #: Merge.rc:179
 #: Merge.rc:294
 #: Merge.rc:476
 #, c-format
-msgid "C&onfiguration..."
+msgid "R&elease Notes"
 msgstr ""
 
 #: Merge.rc:180
 #: Merge.rc:295
 #: Merge.rc:477
 #, c-format
-msgid "A&rchive Support disabled..."
+msgid "C&onfiguration..."
 msgstr ""
 
-#: Merge.rc:182
-#: Merge.rc:297
-#: Merge.rc:479
+#: Merge.rc:181
+#: Merge.rc:296
+#: Merge.rc:478
 #, c-format
-msgid "&GNU Public License..."
-msgstr "Licen\xE7a P\xFAblica GNU..."
+msgid "A&rchive Support disabled..."
+msgstr ""
 
 #: Merge.rc:183
 #: Merge.rc:298
 #: Merge.rc:480
 #, c-format
+msgid "&GNU Public License..."
+msgstr "Licen\xE7a P\xFAblica GNU..."
+
+#: Merge.rc:184
+#: Merge.rc:299
+#: Merge.rc:481
+#, c-format
 msgid "&About WinMerge..."
 msgstr "&Sobre o WinMerge..."
 
-#: Merge.rc:194
-#: Merge.rc:309
+#: Merge.rc:195
+#: Merge.rc:310
 #, c-format
 msgid "Open Pro&ject...\tCtrl+J"
 msgstr ""
 
-#: Merge.rc:197
-#: Merge.rc:328
+#: Merge.rc:198
+#: Merge.rc:329
 #, c-format
 msgid "L&eft Read-only"
 msgstr ""
 
-#: Merge.rc:198
-#: Merge.rc:329
+#: Merge.rc:199
+#: Merge.rc:330
 #, c-format
 msgid "Ri&ght Read-only"
 msgstr ""
 
-#: Merge.rc:200
+#: Merge.rc:201
 #, c-format
 msgid "File En&coding"
 msgstr ""
 
-#: Merge.rc:206
-#: Merge.rc:354
+#: Merge.rc:207
+#: Merge.rc:355
 #, c-format
 msgid "Select &All\tCtrl+A"
 msgstr ""
 
-#: Merge.rc:212
+#: Merge.rc:213
 #, c-format
 msgid "Show &Identical Items"
 msgstr ""
 
-#: Merge.rc:213
+#: Merge.rc:214
 #, c-format
 msgid "Show &Different Items"
 msgstr ""
 
-#: Merge.rc:214
+#: Merge.rc:215
 #, c-format
 msgid "Show L&eft Unique Items"
 msgstr ""
 
-#: Merge.rc:215
+#: Merge.rc:216
 #, c-format
 msgid "Show Ri&ght Unique Items"
 msgstr ""
 
-#: Merge.rc:216
+#: Merge.rc:217
 #, c-format
 msgid "Show S&kipped Items"
 msgstr ""
 
-#: Merge.rc:217
+#: Merge.rc:218
 #, c-format
 msgid "S&how Binary Files"
 msgstr ""
 
-#: Merge.rc:219
+#: Merge.rc:220
 #, c-format
 msgid "Show Hidd&en Items"
 msgstr ""
 
-#: Merge.rc:232
+#: Merge.rc:233
 #, c-format
 msgid "Compa&re Statistics"
 msgstr ""
 
-#: Merge.rc:236
-#: Merge.rc:413
+#: Merge.rc:237
+#: Merge.rc:414
 #, c-format
 msgid "Refre&sh\tF5"
 msgstr "Atuali&zar\tF5"
 
-#: Merge.rc:237
+#: Merge.rc:238
 #, c-format
 msgid "&Refresh Selected\tCtrl+F5"
 msgstr ""
 
-#: Merge.rc:239
-#: Merge.rc:415
+#: Merge.rc:240
+#: Merge.rc:416
 #, c-format
 msgid "&Merge"
 msgstr ""
 
-#: Merge.rc:241
+#: Merge.rc:242
 #, c-format
 msgid "Co&mpare\tEnter"
 msgstr ""
 
-#: Merge.rc:243
-#: Merge.rc:417
+#: Merge.rc:244
+#: Merge.rc:418
 #, c-format
 msgid "&Next Difference\tAlt+Down"
 msgstr "&Pr\xF3xima diferen\xE7a\tAlt+Down"
 
-#: Merge.rc:244
-#: Merge.rc:418
+#: Merge.rc:245
+#: Merge.rc:419
 #, c-format
 msgid "&Previous Difference\tAlt+Up"
 msgstr "Diferen\xE7a &anterior\tAlt+Up"
 
-#: Merge.rc:246
-#: Merge.rc:420
+#: Merge.rc:247
+#: Merge.rc:421
 #, c-format
 msgid "&First Difference\tAlt+Home"
 msgstr "Primeira &Diferen\xE7a\tAlt+Home"
 
-#: Merge.rc:247
-#: Merge.rc:421
+#: Merge.rc:248
+#: Merge.rc:422
 #, c-format
 msgid "&Current Difference\tAlt+Enter"
 msgstr "Diferen\xE7a Corre&nte\tAlt+Enter"
 
-#: Merge.rc:248
-#: Merge.rc:422
+#: Merge.rc:249
+#: Merge.rc:423
 #, c-format
 msgid "&Last Difference\tAlt+End"
 msgstr "&Ultima Diferen\xE7a\tAlt+End"
 
-#: Merge.rc:250
-#: Merge.rc:424
+#: Merge.rc:251
+#: Merge.rc:425
 #, c-format
 msgid "Copy to &Right\tAlt+Right"
 msgstr "Copiar para a &Direita\tAlt+Right"
 
-#: Merge.rc:251
-#: Merge.rc:425
+#: Merge.rc:252
+#: Merge.rc:426
 #, c-format
 msgid "Copy to L&eft\tAlt+Left"
 msgstr "Copiar para a &Esquerda\tAlt+Left"
 
-#: Merge.rc:253
+#: Merge.rc:254
 #, c-format
 msgid "&Delete\tDel"
 msgstr ""
 
-#: Merge.rc:257
-#: Merge.rc:548
+#: Merge.rc:258
+#: Merge.rc:549
 #, c-format
 msgid "&Customize Columns..."
 msgstr ""
 
-#: Merge.rc:260
-#: Merge.rc:437
+#: Merge.rc:261
+#: Merge.rc:438
 #, c-format
 msgid "Generate &Report..."
 msgstr ""
 
-#: Merge.rc:312
+#: Merge.rc:313
 #, c-format
 msgid "&Save\tCtrl+S"
 msgstr "Sal&var\tCtrl+S"
 
-#: Merge.rc:313
+#: Merge.rc:314
 #, c-format
 msgid "Save &Left"
 msgstr ""
 
-#: Merge.rc:315
-#: Merge.rc:320
+#: Merge.rc:316
+#: Merge.rc:321
 #, c-format
 msgid "&Save"
 msgstr ""
 
-#: Merge.rc:316
-#: Merge.rc:321
+#: Merge.rc:317
+#: Merge.rc:322
 #, c-format
 msgid "Save &As..."
 msgstr ""
 
-#: Merge.rc:318
+#: Merge.rc:319
 #, c-format
 msgid "Save &Right"
 msgstr ""
 
-#: Merge.rc:324
+#: Merge.rc:325
 #, c-format
 msgid "&Print..."
 msgstr ""
 
-#: Merge.rc:325
+#: Merge.rc:326
 #, c-format
 msgid "Page Se&tup"
 msgstr ""
 
-#: Merge.rc:326
+#: Merge.rc:327
 #, c-format
 msgid "Print Previe&w"
 msgstr ""
 
-#: Merge.rc:331
+#: Merge.rc:332
 #, c-format
 msgid "&Convert Line Endings to"
 msgstr ""
 
-#: Merge.rc:333
+#: Merge.rc:334
 #, c-format
 msgid "&DOS (CRLF)"
 msgstr ""
 
-#: Merge.rc:334
+#: Merge.rc:335
 #, c-format
 msgid "&UNIX (LF)"
 msgstr ""
 
-#: Merge.rc:335
+#: Merge.rc:336
 #, c-format
 msgid "&MAC (CR)"
 msgstr ""
 
-#: Merge.rc:338
+#: Merge.rc:339
 #, c-format
 msgid "&Merge Mode\tF9"
 msgstr ""
 
-#: Merge.rc:340
+#: Merge.rc:341
 #, c-format
 msgid "&File Encoding..."
 msgstr ""
 
-#: Merge.rc:346
+#: Merge.rc:347
 #, c-format
 msgid "&Undo\tCtrl+Z"
 msgstr "&Desfazer\tCtrl+Z"
 
-#: Merge.rc:347
+#: Merge.rc:348
 #, c-format
 msgid "&Redo\tCtrl+Y"
 msgstr "&Refazer\tCtrl+Y"
 
-#: Merge.rc:349
+#: Merge.rc:350
 #, c-format
 msgid "Cu&t\tCtrl+X"
 msgstr "Cor&tar\tCtrl+X"
 
-#: Merge.rc:350
+#: Merge.rc:351
 #, c-format
 msgid "&Copy\tCtrl+C"
 msgstr "&Copiar\tCtrl+C"
 
-#: Merge.rc:351
+#: Merge.rc:352
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr "Co&lar\tCtrl+V"
 
-#: Merge.rc:353
+#: Merge.rc:354
 #, c-format
 msgid "Select Line &Difference\tF4"
 msgstr ""
 
-#: Merge.rc:356
+#: Merge.rc:357
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr "Pr&ocurar...\tCtrl+F"
 
-#: Merge.rc:357
+#: Merge.rc:358
 #, c-format
 msgid "Repla&ce...\tCtrl+H"
 msgstr "Al&terar...\tCtrl+H"
 
-#: Merge.rc:359
+#: Merge.rc:360
 #, c-format
 msgid "&Scripts"
 msgstr ""
 
-#: Merge.rc:361
-#: Merge.rc:2865
+#: Merge.rc:362
+#: Merge.rc:2870
 #, c-format
 msgid "< Empty >"
 msgstr ""
 
-#: Merge.rc:364
+#: Merge.rc:365
 #, c-format
 msgid "Advanced"
 msgstr ""
 
-#: Merge.rc:366
+#: Merge.rc:367
 #, c-format
 msgid "&Copy With Line Numbers\tCtrl+Shift+C"
 msgstr ""
 
-#: Merge.rc:369
+#: Merge.rc:370
 #, c-format
 msgid "&Bookmarks"
 msgstr ""
 
-#: Merge.rc:371
+#: Merge.rc:372
 #, c-format
 msgid "&Toggle Bookmark\tCtrl+F2"
 msgstr ""
 
-#: Merge.rc:372
+#: Merge.rc:373
 #, c-format
 msgid "&Next Bookmark\tF2"
 msgstr ""
 
-#: Merge.rc:373
+#: Merge.rc:374
 #, c-format
 msgid "&Previous bookmark\tShift+F2"
 msgstr ""
 
-#: Merge.rc:374
+#: Merge.rc:375
 #, c-format
 msgid "&Clear All Bookmarks"
 msgstr ""
 
-#: Merge.rc:376
+#: Merge.rc:377
 #, c-format
 msgid "&Go To...\tCtrl+G"
 msgstr ""
 
-#: Merge.rc:384
+#: Merge.rc:385
 #, c-format
 msgid "Zoom In\tCtrl++"
 msgstr ""
 
-#: Merge.rc:385
+#: Merge.rc:386
 #, c-format
 msgid "Zoom Out\tCtrl+-"
 msgstr ""
 
-#: Merge.rc:386
+#: Merge.rc:387
 #, c-format
 msgid "Syntax Highlight"
 msgstr ""
 
-#: Merge.rc:391
+#: Merge.rc:392
 #, c-format
 msgid "&Lock Panes"
 msgstr ""
 
-#: Merge.rc:392
+#: Merge.rc:393
 #, c-format
 msgid "&View Whitespace"
 msgstr "E&xibir Espa\xE7os"
 
-#: Merge.rc:393
+#: Merge.rc:394
 #, c-format
 msgid "Vie&w Line Differences"
 msgstr ""
 
-#: Merge.rc:394
+#: Merge.rc:395
 #, c-format
 msgid "View Line &Numbers"
 msgstr ""
 
-#: Merge.rc:395
+#: Merge.rc:396
 #, c-format
 msgid "View &Margins"
 msgstr ""
 
-#: Merge.rc:396
+#: Merge.rc:397
 #, c-format
 msgid "W&rap Lines"
 msgstr ""
 
-#: Merge.rc:398
+#: Merge.rc:399
 #, c-format
 msgid "Sw&ap Panes"
 msgstr ""
 
-#: Merge.rc:408
+#: Merge.rc:409
 #, c-format
 msgid "Diff &Pane"
 msgstr ""
 
-#: Merge.rc:409
+#: Merge.rc:410
 #, c-format
 msgid "Lo&cation Pane"
 msgstr "Location &Pane"
 
-#: Merge.rc:427
+#: Merge.rc:428
 #, c-format
 msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
 msgstr "Copy to Right and Advance\tAlt+Ctrl+Right"
 
-#: Merge.rc:428
+#: Merge.rc:429
 #, c-format
 msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
 msgstr "Copy to Left and Advance\tAlt+Ctrl+Left"
 
-#: Merge.rc:430
+#: Merge.rc:431
 #, c-format
 msgid "Copy &All to Right"
 msgstr "Copiar tudo para a Direita"
 
-#: Merge.rc:431
+#: Merge.rc:432
 #, c-format
 msgid "Cop&y All to Left"
 msgstr "Copiar tudo para a Esquerda"
 
-#: Merge.rc:446
+#: Merge.rc:447
 #, c-format
 msgid "&Prediffer"
 msgstr ""
 
-#: Merge.rc:488
+#: Merge.rc:489
 #, c-format
 msgid "Comp&are"
 msgstr ""
 
-#: Merge.rc:489
+#: Merge.rc:490
 #, c-format
 msgid "Co&mpare Special"
 msgstr ""
 
-#: Merge.rc:491
+#: Merge.rc:492
 #, c-format
 msgid "&XML"
 msgstr ""
 
-#: Merge.rc:496
+#: Merge.rc:497
 #, c-format
 msgid "&Left to Right"
 msgstr ""
 
-#: Merge.rc:497
+#: Merge.rc:498
 #, c-format
 msgid "L&eft to..."
 msgstr ""
 
-#: Merge.rc:498
+#: Merge.rc:499
 #, c-format
 msgid "&Right to Left"
 msgstr ""
 
-#: Merge.rc:499
+#: Merge.rc:500
 #, c-format
 msgid "R&ight to..."
 msgstr ""
 
-#: Merge.rc:501
+#: Merge.rc:502
 #, c-format
 msgid "&Move"
 msgstr ""
 
-#: Merge.rc:503
+#: Merge.rc:504
 #, c-format
 msgid "&Left to..."
 msgstr ""
 
-#: Merge.rc:504
+#: Merge.rc:505
 #, c-format
 msgid "&Right to..."
 msgstr ""
 
-#: Merge.rc:506
+#: Merge.rc:507
 #, c-format
 msgid "&Delete"
 msgstr ""
 
-#: Merge.rc:508
-#: Merge.rc:1120
-#: Merge.rc:1499
+#: Merge.rc:509
+#: Merge.rc:1121
+#: Merge.rc:1500
 #, c-format
 msgid "&Left"
 msgstr ""
 
-#: Merge.rc:509
-#: Merge.rc:1122
-#: Merge.rc:1502
+#: Merge.rc:510
+#: Merge.rc:1123
+#: Merge.rc:1503
 #, c-format
 msgid "&Right"
 msgstr ""
 
-#: Merge.rc:510
+#: Merge.rc:511
 #, c-format
 msgid "&Both"
 msgstr ""
 
-#: Merge.rc:512
+#: Merge.rc:513
 #, c-format
 msgid "Re&name"
 msgstr ""
 
-#: Merge.rc:513
+#: Merge.rc:514
 #, c-format
 msgid "&Hide Items"
 msgstr ""
 
-#: Merge.rc:515
+#: Merge.rc:516
 #, c-format
 msgid "&Open Left"
 msgstr ""
 
-#: Merge.rc:521
+#: Merge.rc:522
 #, c-format
 msgid "O&pen Right"
 msgstr ""
 
-#: Merge.rc:528
+#: Merge.rc:529
 #, c-format
 msgid "Cop&y Pathnames"
 msgstr ""
 
-#: Merge.rc:530
+#: Merge.rc:531
 #, c-format
 msgid "&Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:531
+#: Merge.rc:532
 #, c-format
 msgid "&Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:532
+#: Merge.rc:533
 #, c-format
 msgid "&Both (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:534
+#: Merge.rc:535
 #, c-format
 msgid "Copy &Filenames"
 msgstr ""
 
-#: Merge.rc:536
+#: Merge.rc:537
 #, c-format
 msgid "&Zip"
 msgstr ""
 
-#: Merge.rc:538
+#: Merge.rc:539
 #, c-format
 msgid "&Left... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:539
+#: Merge.rc:540
 #, c-format
 msgid "&Right... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:540
+#: Merge.rc:541
 #, c-format
 msgid "&Both... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:541
+#: Merge.rc:542
 #, c-format
 msgid "&Differences... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:544
+#: Merge.rc:545
 #, c-format
 msgid "&Refresh"
 msgstr ""
 
-#: Merge.rc:556
+#: Merge.rc:557
 #, c-format
 msgid "&Copy Full Path"
 msgstr ""
 
-#: Merge.rc:557
+#: Merge.rc:558
 #, c-format
 msgid "Copy &Filename"
 msgstr ""
 
-#: Merge.rc:563
+#: Merge.rc:564
 #, c-format
 msgid "Prediffer Settings"
 msgstr ""
 
-#: Merge.rc:565
+#: Merge.rc:566
 #, c-format
 msgid "&No prediffer"
 msgstr ""
 
-#: Merge.rc:566
+#: Merge.rc:567
 #, c-format
 msgid "Auto prediffer"
 msgstr ""
 
-#: Merge.rc:574
+#: Merge.rc:575
 #, c-format
 msgid "G&oto Diff"
 msgstr ""
 
-#: Merge.rc:577
+#: Merge.rc:578
 #, c-format
 msgid "&No Moved Blocks"
 msgstr ""
 
-#: Merge.rc:578
+#: Merge.rc:579
 #, c-format
 msgid "&All Moved Blocks"
 msgstr ""
 
-#: Merge.rc:579
+#: Merge.rc:580
 #, c-format
 msgid "Moved Block for &Current Diff"
 msgstr ""
 
-#: Merge.rc:647
+#: Merge.rc:648
 #, c-format
 msgid "About WinMerge"
 msgstr "Sobre o WinMerge"
 
-#: Merge.rc:653
+#: Merge.rc:654
 #, c-format
 msgid "(Private Build)"
 msgstr ""
 
-#: Merge.rc:654
+#: Merge.rc:655
 #, c-format
 msgid "All rights reserved."
 msgstr "Todos os direitos reservados."
 
-#: Merge.rc:655
+#: Merge.rc:656
 #, c-format
 msgid "Visit the WinMerge HomePage!"
 msgstr "Visite o site do WinMerge!"
 
-#: Merge.rc:658
-#: Merge.rc:689
-#: Merge.rc:779
-#: Merge.rc:965
-#: Merge.rc:1039
-#: Merge.rc:1068
-#: Merge.rc:1078
-#: Merge.rc:1241
-#: Merge.rc:1305
-#: Merge.rc:1318
-#: Merge.rc:1410
-#: Merge.rc:1425
+#: Merge.rc:659
+#: Merge.rc:690
+#: Merge.rc:780
+#: Merge.rc:966
+#: Merge.rc:1040
+#: Merge.rc:1069
+#: Merge.rc:1079
+#: Merge.rc:1242
+#: Merge.rc:1306
+#: Merge.rc:1319
+#: Merge.rc:1411
+#: Merge.rc:1426
 #, c-format
 msgid "OK"
 msgstr ""
 
-#: Merge.rc:659
+#: Merge.rc:660
 #, c-format
 msgid "Contributors"
 msgstr ""
 
-#: Merge.rc:665
+#: Merge.rc:666
 #, c-format
 msgid "Select Files or Folders"
 msgstr "Selecione Arquivos ou Diret\xF3rios..."
 
-#: Merge.rc:668
-#: Merge.rc:1576
+#: Merge.rc:669
+#: Merge.rc:1577
 #, c-format
 msgid "&Left:"
 msgstr "&Esquerda:"
 
-#: Merge.rc:672
-#: Merge.rc:733
-#: Merge.rc:989
-#: Merge.rc:1004
+#: Merge.rc:673
+#: Merge.rc:734
+#: Merge.rc:990
+#: Merge.rc:1005
 #, c-format
 msgid "&Browse..."
 msgstr "&Procurar..."
 
-#: Merge.rc:673
-#: Merge.rc:1580
+#: Merge.rc:674
+#: Merge.rc:1581
 #, c-format
 msgid "&Right:"
 msgstr "&Direita:"
 
-#: Merge.rc:677
-#: Merge.rc:1015
+#: Merge.rc:678
+#: Merge.rc:1016
 #, c-format
 msgid "Bro&wse..."
 msgstr "Pro&curar..."
 
-#: Merge.rc:678
-#: Merge.rc:1584
+#: Merge.rc:679
+#: Merge.rc:1585
 #, c-format
 msgid "&Filter:"
 msgstr ""
 
-#: Merge.rc:681
-#: Merge.rc:1586
+#: Merge.rc:682
+#: Merge.rc:1587
 #, c-format
 msgid "Select..."
 msgstr ""
 
-#: Merge.rc:682
+#: Merge.rc:683
 #, c-format
 msgid "&Unpacker:"
 msgstr ""
 
-#: Merge.rc:685
+#: Merge.rc:686
 #, c-format
 msgid "&Select..."
 msgstr ""
 
-#: Merge.rc:686
-#: Merge.rc:1587
+#: Merge.rc:687
+#: Merge.rc:1588
 #, c-format
 msgid "&Include Subfolders"
 msgstr ""
 
-#: Merge.rc:688
+#: Merge.rc:689
 #, c-format
 msgid "Status:"
 msgstr ""
 
-#: Merge.rc:690
-#: Merge.rc:720
-#: Merge.rc:780
-#: Merge.rc:810
-#: Merge.rc:842
-#: Merge.rc:852
-#: Merge.rc:1040
-#: Merge.rc:1069
-#: Merge.rc:1079
-#: Merge.rc:1130
-#: Merge.rc:1242
-#: Merge.rc:1319
-#: Merge.rc:1411
-#: Merge.rc:1426
+#: Merge.rc:691
+#: Merge.rc:721
+#: Merge.rc:781
+#: Merge.rc:811
+#: Merge.rc:843
+#: Merge.rc:853
+#: Merge.rc:1041
+#: Merge.rc:1070
+#: Merge.rc:1080
+#: Merge.rc:1131
+#: Merge.rc:1243
+#: Merge.rc:1320
+#: Merge.rc:1412
+#: Merge.rc:1427
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Merge.rc:691
-#: Merge.rc:1320
+#: Merge.rc:692
+#: Merge.rc:1321
 #, c-format
 msgid "Help"
 msgstr ""
 
-#: Merge.rc:692
+#: Merge.rc:693
 #, c-format
 msgid "Files or Folders to Compare"
 msgstr "Arquivos ou Diret\xF3rios a Comparar"
 
-#: Merge.rc:699
+#: Merge.rc:700
 #, c-format
 msgid "Visual SourceSafe"
 msgstr ""
 
-#: Merge.rc:704
+#: Merge.rc:705
 #, c-format
 msgid "Database:"
 msgstr ""
 
-#: Merge.rc:707
+#: Merge.rc:708
 #, c-format
 msgid "Project:"
 msgstr ""
 
-#: Merge.rc:710
+#: Merge.rc:711
 #, c-format
 msgid "User:"
 msgstr ""
 
-#: Merge.rc:712
+#: Merge.rc:713
 #, c-format
 msgid "Password:"
 msgstr ""
 
-#: Merge.rc:714
+#: Merge.rc:715
 #, c-format
 msgid "Link to Destination VSS project"
 msgstr ""
 
-#: Merge.rc:716
-#: Merge.rc:857
+#: Merge.rc:717
+#: Merge.rc:858
 #, c-format
 msgid "Apply to all items"
 msgstr ""
 
-#: Merge.rc:718
+#: Merge.rc:719
 #, c-format
 msgid "Check Out"
 msgstr ""
 
-#: Merge.rc:719
-#: Merge.rc:853
+#: Merge.rc:720
+#: Merge.rc:854
 #, c-format
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: Merge.rc:725
+#: Merge.rc:726
 #, c-format
 msgid "Versioning System"
 msgstr "Sistema de Vers\xF5es"
 
-#: Merge.rc:728
+#: Merge.rc:729
 #, c-format
 msgid "&Versioning System:"
 msgstr "Sistema de &Vers\xF5es:"
 
-#: Merge.rc:731
+#: Merge.rc:732
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Caminho para cleartool.exe:"
 
-#: Merge.rc:738
-#: Merge.rc:1891
+#: Merge.rc:739
+#: Merge.rc:1892
 #, c-format
 msgid "General"
 msgstr "Geral"
 
-#: Merge.rc:741
+#: Merge.rc:742
 #, c-format
 msgid "Automatically &scroll to first difference"
 msgstr "Posicionar a&utomaticamente na primeira diferen\xE7a"
 
-#: Merge.rc:744
+#: Merge.rc:745
 #, c-format
 msgid "&Disable Splash Screen"
 msgstr "&Desabilitar Splash Screen"
 
-#: Merge.rc:746
+#: Merge.rc:747
 #, c-format
 msgid "Cl&ose windows with ESC"
 msgstr ""
 
-#: Merge.rc:748
+#: Merge.rc:749
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
 msgstr ""
 
-#: Merge.rc:751
+#: Merge.rc:752
 #, c-format
 msgid "All&ow only one instance to run"
 msgstr ""
 
-#: Merge.rc:753
+#: Merge.rc:754
 #, c-format
 msgid "As&k when closing multiple windows"
 msgstr ""
 
-#: Merge.rc:755
+#: Merge.rc:756
 #, c-format
 msgid "&Preserve file time in file compare"
 msgstr ""
 
-#: Merge.rc:758
+#: Merge.rc:759
 #, c-format
 msgid "O&pen-dialog Auto-Completion:"
 msgstr ""
 
-#: Merge.rc:761
+#: Merge.rc:762
 #, c-format
 msgid "Enable multiple compare windows for"
 msgstr ""
 
-#: Merge.rc:763
-#: Merge.rc:1599
+#: Merge.rc:764
+#: Merge.rc:1600
 #, c-format
 msgid "&Folder compare"
 msgstr ""
 
-#: Merge.rc:765
-#: Merge.rc:1601
+#: Merge.rc:766
+#: Merge.rc:1602
 #, c-format
 msgid "Fil&e compare"
 msgstr ""
 
-#: Merge.rc:767
+#: Merge.rc:768
 #, c-format
 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
 msgstr ""
 
-#: Merge.rc:769
+#: Merge.rc:770
 #, c-format
 msgid "Reset"
 msgstr ""
 
-#: Merge.rc:776
+#: Merge.rc:777
 #, c-format
 msgid "Language"
 msgstr "Idiomas"
 
-#: Merge.rc:783
+#: Merge.rc:784
 #, c-format
 msgid "Available languages:"
 msgstr "Idiomas dispon\xEDveis:"
 
-#: Merge.rc:789
+#: Merge.rc:790
 #, c-format
 msgid "Find"
 msgstr "Localizar"
 
-#: Merge.rc:792
-#: Merge.rc:819
+#: Merge.rc:793
+#: Merge.rc:820
 #, c-format
 msgid "Fi&nd what:"
 msgstr "&Localizar:"
 
-#: Merge.rc:795
-#: Merge.rc:825
+#: Merge.rc:796
+#: Merge.rc:826
 #, c-format
 msgid "Match &whole word only"
 msgstr "Somente p&alavras iguais"
 
-#: Merge.rc:797
-#: Merge.rc:827
+#: Merge.rc:798
+#: Merge.rc:828
 #, c-format
 msgid "Match &case"
 msgstr "&Diferenciar mai\xFAsculas de min\xFAsculas"
 
-#: Merge.rc:799
-#: Merge.rc:829
+#: Merge.rc:800
+#: Merge.rc:830
 #, c-format
 msgid "Regular &expression"
 msgstr "&Express\xE3o regular"
 
-#: Merge.rc:801
+#: Merge.rc:802
 #, c-format
 msgid "D&on't wrap end of file"
 msgstr ""
 
-#: Merge.rc:804
+#: Merge.rc:805
 #, c-format
 msgid "Direction"
 msgstr "Dire\xE7\xE3o"
 
-#: Merge.rc:805
+#: Merge.rc:806
 #, c-format
 msgid "&Up"
 msgstr "A&cima"
 
-#: Merge.rc:807
+#: Merge.rc:808
 #, c-format
 msgid "&Down"
 msgstr "A&baixo"
 
-#: Merge.rc:809
-#: Merge.rc:839
+#: Merge.rc:810
+#: Merge.rc:840
 #, c-format
 msgid "&Find Next"
 msgstr "&Pr\xF3ximo"
 
-#: Merge.rc:816
+#: Merge.rc:817
 #, c-format
 msgid "Replace"
 msgstr "Localizar e Substituir"
 
-#: Merge.rc:822
+#: Merge.rc:823
 #, c-format
 msgid "Re&place with:"
 msgstr "Su&bstituir por:"
 
-#: Merge.rc:831
+#: Merge.rc:832
 #, c-format
 msgid "&Don't wrap end of file"
 msgstr ""
 
-#: Merge.rc:834
+#: Merge.rc:835
 #, c-format
 msgid "Replace in"
 msgstr "Substituir"
 
-#: Merge.rc:835
+#: Merge.rc:836
 #, c-format
 msgid "&Selection"
 msgstr "Somente &na sele\xE7\xE3o"
 
-#: Merge.rc:837
+#: Merge.rc:838
 #, c-format
 msgid "Wh&ole file"
 msgstr "Em todo &documento"
 
-#: Merge.rc:840
+#: Merge.rc:841
 #, c-format
 msgid "&Replace"
 msgstr "&Substituir"
 
-#: Merge.rc:841
+#: Merge.rc:842
 #, c-format
 msgid "Replace &All"
 msgstr "&Todos"
 
-#: Merge.rc:848
-#: Merge.rc:2116
+#: Merge.rc:849
+#: Merge.rc:2120
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
 
-#: Merge.rc:851
+#: Merge.rc:852
 #, c-format
 msgid "CheckOut"
 msgstr ""
 
-#: Merge.rc:856
-#: Merge.rc:1161
+#: Merge.rc:857
+#: Merge.rc:1162
 #, c-format
 msgid "Comments"
 msgstr "Coment\xE1rios"
 
-#: Merge.rc:859
+#: Merge.rc:860
 #, c-format
 msgid "CheckIn after checkout"
 msgstr ""
 
-#: Merge.rc:865
+#: Merge.rc:866
 #, c-format
 msgid "Linefilters"
 msgstr ""
 
-#: Merge.rc:868
+#: Merge.rc:869
 #, c-format
 msgid "Enable Line Filters"
 msgstr ""
 
-#: Merge.rc:871
+#: Merge.rc:872
 #, c-format
 msgid "Regular Expressions (one per line):"
 msgstr "Express\xF5es (uma por linha):"
 
-#: Merge.rc:878
+#: Merge.rc:879
 #, c-format
 msgid "Save"
 msgstr ""
 
-#: Merge.rc:879
+#: Merge.rc:880
 #, c-format
 msgid "New"
 msgstr ""
 
-#: Merge.rc:880
+#: Merge.rc:881
 #, c-format
 msgid "Edit"
 msgstr ""
 
-#: Merge.rc:881
+#: Merge.rc:882
 #, c-format
 msgid "Remove"
 msgstr ""
 
-#: Merge.rc:886
-#: Merge.rc:1894
+#: Merge.rc:887
+#: Merge.rc:1895
 #, c-format
 msgid "Colors"
 msgstr "Cores"
 
-#: Merge.rc:889
+#: Merge.rc:890
 #, c-format
 msgid "Difference:"
 msgstr "Diferen\xE7a:"
 
-#: Merge.rc:893
+#: Merge.rc:894
 #, c-format
 msgid "Selected Difference:"
 msgstr "Diferen\xE7a Selecionada:"
 
-#: Merge.rc:897
-#: Merge.rc:1551
+#: Merge.rc:898
+#: Merge.rc:1552
 #, c-format
 msgid "Background"
 msgstr ""
 
-#: Merge.rc:898
+#: Merge.rc:899
 #, c-format
 msgid "Deleted"
 msgstr ""
 
-#: Merge.rc:911
-#: Merge.rc:1346
-#: Merge.rc:1552
+#: Merge.rc:912
+#: Merge.rc:1347
+#: Merge.rc:1553
 #, c-format
 msgid "Text"
 msgstr ""
 
-#: Merge.rc:915
+#: Merge.rc:916
 #, c-format
 msgid "Ignored Difference:"
 msgstr ""
 
-#: Merge.rc:925
+#: Merge.rc:926
 #, c-format
 msgid "Moved:"
 msgstr ""
 
-#: Merge.rc:935
+#: Merge.rc:936
 #, c-format
 msgid "Selected Moved:"
 msgstr ""
 
-#: Merge.rc:942
+#: Merge.rc:943
 #, c-format
 msgid "Word Difference:"
 msgstr ""
 
-#: Merge.rc:949
+#: Merge.rc:950
 #, c-format
 msgid "Selected Word Diff:"
 msgstr ""
 
-#: Merge.rc:956
-#: Merge.rc:1038
-#: Merge.rc:1067
-#: Merge.rc:1164
-#: Merge.rc:1392
+#: Merge.rc:957
+#: Merge.rc:1039
+#: Merge.rc:1068
+#: Merge.rc:1165
+#: Merge.rc:1393
 #, c-format
 msgid "Defaults"
 msgstr ""
 
-#: Merge.rc:962
-#: Merge.rc:1334
-#: Merge.rc:1540
+#: Merge.rc:963
+#: Merge.rc:1335
+#: Merge.rc:1541
 #, c-format
 msgid "Dialog"
 msgstr "Di\xE1logo"
 
-#: Merge.rc:972
-#: Merge.rc:1897
+#: Merge.rc:973
+#: Merge.rc:1898
 #, c-format
 msgid "System"
 msgstr ""
 
-#: Merge.rc:975
+#: Merge.rc:976
 #, c-format
 msgid "&Send deleted files to Recycle Bin"
 msgstr ""
 
-#: Merge.rc:977
+#: Merge.rc:978
 #, c-format
 msgid "Ign&ore time differences less than 3 seconds"
 msgstr ""
 
-#: Merge.rc:980
+#: Merge.rc:981
 #, c-format
 msgid "Integration"
 msgstr ""
 
-#: Merge.rc:981
+#: Merge.rc:982
 #, c-format
 msgid "&Add to explorer context menu"
 msgstr ""
 
-#: Merge.rc:983
+#: Merge.rc:984
 #, c-format
 msgid "E&nable advanced menu"
 msgstr ""
 
-#: Merge.rc:985
+#: Merge.rc:986
 #, c-format
 msgid "In&clude subfolders by default"
 msgstr ""
 
-#: Merge.rc:987
+#: Merge.rc:988
 #, c-format
 msgid "&External editor:"
 msgstr ""
 
-#: Merge.rc:990
+#: Merge.rc:991
 #, c-format
 msgid "&Filter folder:"
 msgstr ""
 
-#: Merge.rc:992
-#: Merge.rc:1404
-#: Merge.rc:1578
-#: Merge.rc:1582
-#: Merge.rc:1609
+#: Merge.rc:993
+#: Merge.rc:1405
+#: Merge.rc:1579
+#: Merge.rc:1583
+#: Merge.rc:1610
 #, c-format
 msgid "Browse..."
 msgstr ""
 
-#: Merge.rc:998
+#: Merge.rc:999
 #, c-format
 msgid "Patch Generator"
 msgstr ""
 
-#: Merge.rc:1001
+#: Merge.rc:1002
 #, c-format
 msgid "File&1:"
 msgstr ""
 
-#: Merge.rc:1005
+#: Merge.rc:1006
 #, c-format
 msgid "File&2:"
 msgstr ""
 
-#: Merge.rc:1008
+#: Merge.rc:1009
 #, c-format
 msgid "Br&owse..."
 msgstr ""
 
-#: Merge.rc:1009
+#: Merge.rc:1010
 #, c-format
 msgid "&Swap"
 msgstr ""
 
-#: Merge.rc:1010
+#: Merge.rc:1011
 #, c-format
 msgid "&Append to existing file"
 msgstr ""
 
-#: Merge.rc:1012
+#: Merge.rc:1013
 #, c-format
 msgid "&Result:"
 msgstr ""
 
-#: Merge.rc:1016
+#: Merge.rc:1017
 #, c-format
 msgid "&Format"
 msgstr ""
 
-#: Merge.rc:1017
+#: Merge.rc:1018
 #, c-format
 msgid "St&yle:"
 msgstr ""
 
-#: Merge.rc:1020
+#: Merge.rc:1021
 #, c-format
 msgid "&Context:"
 msgstr ""
 
-#: Merge.rc:1023
+#: Merge.rc:1024
 #, c-format
 msgid "W&hitespaces"
 msgstr ""
 
-#: Merge.rc:1024
+#: Merge.rc:1025
 #, c-format
 msgid "Com&pare"
 msgstr ""
 
-#: Merge.rc:1026
+#: Merge.rc:1027
 #, c-format
 msgid "I&gnore changes"
 msgstr ""
 
-#: Merge.rc:1028
+#: Merge.rc:1029
 #, c-format
 msgid "Ig&nore all"
 msgstr ""
 
-#: Merge.rc:1030
+#: Merge.rc:1031
 #, c-format
 msgid "Ignor&e blank lines"
 msgstr ""
 
-#: Merge.rc:1032
+#: Merge.rc:1033
 #, c-format
 msgid "Case sensi&tive"
 msgstr ""
 
-#: Merge.rc:1034
+#: Merge.rc:1035
 #, c-format
 msgid "Inclu&de command line"
 msgstr ""
 
-#: Merge.rc:1036
+#: Merge.rc:1037
 #, c-format
 msgid "Open to e&xternal editor"
 msgstr ""
 
-#: Merge.rc:1058
+#: Merge.rc:1059
 #, c-format
 msgid "Display Columns"
 msgstr ""
 
-#: Merge.rc:1064
+#: Merge.rc:1065
 #, c-format
 msgid "Move &Up"
 msgstr ""
 
-#: Merge.rc:1065
+#: Merge.rc:1066
 #, c-format
 msgid "Move &Down"
 msgstr ""
 
-#: Merge.rc:1075
+#: Merge.rc:1076
 #, c-format
 msgid "Select Unpacker"
 msgstr ""
 
-#: Merge.rc:1080
+#: Merge.rc:1081
 #, c-format
 msgid "File unpacker:"
 msgstr ""
 
-#: Merge.rc:1083
+#: Merge.rc:1084
 #, c-format
 msgid "Display all unpackers, don't check the extension"
 msgstr ""
 
-#: Merge.rc:1086
+#: Merge.rc:1087
 #, c-format
 msgid "Extensions list:"
 msgstr ""
 
-#: Merge.rc:1087
+#: Merge.rc:1088
 #, c-format
 msgid "Description:"
 msgstr ""
 
-#: Merge.rc:1098
+#: Merge.rc:1099
 #, c-format
 msgid " Folder Compare Progress"
 msgstr ""
 
-#: Merge.rc:1101
-#: Merge.rc:1844
+#: Merge.rc:1102
+#: Merge.rc:1845
 #, c-format
 msgid "Stop"
 msgstr ""
 
-#: Merge.rc:1106
+#: Merge.rc:1107
 #, c-format
 msgid "Comparing items..."
 msgstr ""
 
-#: Merge.rc:1107
+#: Merge.rc:1108
 #, c-format
 msgid "Items compared:"
 msgstr ""
 
-#: Merge.rc:1108
+#: Merge.rc:1109
 #, c-format
 msgid "Items total:"
 msgstr ""
 
-#: Merge.rc:1114
+#: Merge.rc:1115
 #, c-format
 msgid "Go To"
 msgstr ""
 
-#: Merge.rc:1117
+#: Merge.rc:1118
 #, c-format
 msgid "G&oto:"
 msgstr ""
 
-#: Merge.rc:1119
+#: Merge.rc:1120
 #, c-format
 msgid "File"
 msgstr ""
 
-#: Merge.rc:1124
+#: Merge.rc:1125
 #, c-format
 msgid "Goto what"
 msgstr ""
 
-#: Merge.rc:1125
+#: Merge.rc:1126
 #, c-format
 msgid "Li&ne"
 msgstr ""
 
-#: Merge.rc:1127
+#: Merge.rc:1128
 #, c-format
 msgid "&Difference"
 msgstr ""
 
-#: Merge.rc:1129
+#: Merge.rc:1130
 #, c-format
 msgid "&Go To"
 msgstr ""
 
-#: Merge.rc:1135
-#: Merge.rc:1892
+#: Merge.rc:1136
+#: Merge.rc:1893
 #, c-format
 msgid "Compare"
 msgstr ""
 
-#: Merge.rc:1138
+#: Merge.rc:1139
 #, c-format
 msgid "Whitespace"
 msgstr ""
 
-#: Merge.rc:1139
+#: Merge.rc:1140
 #, c-format
 msgid "&Compare"
 msgstr "Comparar e&spa\xE7os em branco"
 
-#: Merge.rc:1141
+#: Merge.rc:1142
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignorar mofica\xE7\xF5es nos espa\xE7os em branco"
 
-#: Merge.rc:1143
+#: Merge.rc:1144
 #, c-format
 msgid "I&gnore all"
 msgstr "Ignora t&odos espa\xE7os em branco"
 
-#: Merge.rc:1145
+#: Merge.rc:1146
 #, c-format
 msgid "Ignore blan&k lines"
 msgstr "Ignorar linhas em bran&co"
 
-#: Merge.rc:1147
+#: Merge.rc:1148
 #, c-format
 msgid "Ignore &case"
 msgstr "Ignorar &ma\xEDsculas/min\xFAsculas"
 
-#: Merge.rc:1149
+#: Merge.rc:1150
 #, c-format
 msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
 msgstr ""
 
-#: Merge.rc:1152
+#: Merge.rc:1153
 #, c-format
 msgid "E&nable moved block detection"
 msgstr ""
 
-#: Merge.rc:1154
+#: Merge.rc:1155
 #, c-format
 msgid "&Match similar lines"
 msgstr ""
 
-#: Merge.rc:1156
+#: Merge.rc:1157
 #, c-format
 msgid "&File Compare method:"
 msgstr ""
 
-#: Merge.rc:1159
+#: Merge.rc:1160
 #, c-format
 msgid "S&top after first difference"
 msgstr ""
 
-#: Merge.rc:1162
+#: Merge.rc:1163
 #, c-format
 msgid "Filter Comments"
 msgstr ""
 
-#: Merge.rc:1169
-#: Merge.rc:1893
+#: Merge.rc:1170
+#: Merge.rc:1894
 #, c-format
 msgid "Editor"
 msgstr ""
 
-#: Merge.rc:1172
+#: Merge.rc:1173
 #, c-format
 msgid "&Highlight syntax"
 msgstr "Destacar sintaxe"
 
-#: Merge.rc:1174
+#: Merge.rc:1175
 #, c-format
 msgid "&Automatic rescan"
 msgstr "&Atualiza\xE7\xE3o autom\xE1tica"
 
-#: Merge.rc:1176
+#: Merge.rc:1177
 #, c-format
 msgid "&Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1178
+#: Merge.rc:1179
 #, c-format
 msgid "Tabs"
 msgstr "Tabula\xE7\xE3o"
 
-#: Merge.rc:1179
+#: Merge.rc:1180
 #, c-format
 msgid "&Tab size:"
 msgstr "Tama&nho da tabula\xE7\xE3o:"
 
-#: Merge.rc:1182
+#: Merge.rc:1183
 #, c-format
 msgid "&Insert Tabs"
 msgstr ""
 
-#: Merge.rc:1184
+#: Merge.rc:1185
 #, c-format
 msgid "Insert &Spaces"
 msgstr ""
 
-#: Merge.rc:1186
+#: Merge.rc:1187
 #, c-format
 msgid "Line Difference Coloring"
 msgstr ""
 
-#: Merge.rc:1188
+#: Merge.rc:1189
 #, c-format
 msgid "View line differences"
 msgstr ""
 
-#: Merge.rc:1190
+#: Merge.rc:1191
 #, c-format
 msgid "&Character level"
 msgstr ""
 
-#: Merge.rc:1192
+#: Merge.rc:1193
 #, c-format
 msgid "&Word-level:"
 msgstr ""
 
-#: Merge.rc:1207
+#: Merge.rc:1208
 #, c-format
 msgid "Filefilters"
 msgstr ""
 
-#: Merge.rc:1213
+#: Merge.rc:1214
 #, c-format
 msgid "Test"
 msgstr ""
 
-#: Merge.rc:1214
+#: Merge.rc:1215
 #, c-format
 msgid "Install..."
 msgstr ""
 
-#: Merge.rc:1215
+#: Merge.rc:1216
 #, c-format
 msgid "New..."
 msgstr ""
 
-#: Merge.rc:1216
+#: Merge.rc:1217
 #, c-format
 msgid "Edit..."
 msgstr ""
 
-#: Merge.rc:1217
+#: Merge.rc:1218
 #, c-format
 msgid "Delete..."
 msgstr ""
 
-#: Merge.rc:1223
+#: Merge.rc:1224
 #, c-format
 msgid "Save modified files?"
 msgstr ""
 
-#: Merge.rc:1226
+#: Merge.rc:1227
 #, c-format
 msgid "Left side file"
 msgstr ""
 
-#: Merge.rc:1229
+#: Merge.rc:1230
 #, c-format
 msgid "&Save changes"
 msgstr ""
 
-#: Merge.rc:1231
+#: Merge.rc:1232
 #, c-format
 msgid "&Discard changes"
 msgstr ""
 
-#: Merge.rc:1233
+#: Merge.rc:1234
 #, c-format
 msgid "Right side file"
 msgstr ""
 
-#: Merge.rc:1236
+#: Merge.rc:1237
 #, c-format
 msgid "S&ave changes"
 msgstr ""
 
-#: Merge.rc:1238
+#: Merge.rc:1239
 #, c-format
 msgid "Dis&card changes"
 msgstr ""
 
-#: Merge.rc:1240
+#: Merge.rc:1241
 #, c-format
 msgid "Discard All"
 msgstr ""
 
-#: Merge.rc:1247
-#: Merge.rc:1495
-#: Merge.rc:1899
+#: Merge.rc:1248
+#: Merge.rc:1496
+#: Merge.rc:1900
 #, c-format
 msgid "Codepage"
 msgstr ""
 
-#: Merge.rc:1250
+#: Merge.rc:1251
 #, c-format
 msgid "Default Codepage"
 msgstr ""
 
-#: Merge.rc:1251
+#: Merge.rc:1252
 #, c-format
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr ""
 
-#: Merge.rc:1253
+#: Merge.rc:1254
 #, c-format
 msgid ""
 "Detect codepage info for these files : .html, .rc, .xml \n"
 "need to restart session"
 msgstr ""
 
-#: Merge.rc:1256
+#: Merge.rc:1257
 #, c-format
 msgid "System codepage"
 msgstr ""
 
-#: Merge.rc:1258
+#: Merge.rc:1259
 #, c-format
 msgid "According to WinMerge User Interface"
 msgstr ""
 
-#: Merge.rc:1260
+#: Merge.rc:1261
 #, c-format
 msgid "Custom codepage :"
 msgstr ""
 
-#: Merge.rc:1268
+#: Merge.rc:1269
 #, c-format
 msgid "WinMerge - Archive support disabled"
 msgstr ""
 
-#: Merge.rc:1271
+#: Merge.rc:1272
 #, c-format
 msgid "Unable to detect 7-Zip version (not installed?)"
 msgstr ""
 
-#: Merge.rc:1274
+#: Merge.rc:1275
 #, c-format
 msgid ""
 "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
 "essential components to be copied to the program directory for standalone operation."
 msgstr ""
 
-#: Merge.rc:1276
+#: Merge.rc:1277
 #, c-format
 msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
 msgstr ""
 
-#: Merge.rc:1278
+#: Merge.rc:1279
 #, c-format
 msgid ""
 "Please use the version of 7-Zip recommended below until interface plugins for later\n"
 "versions become available."
 msgstr ""
 
-#: Merge.rc:1280
+#: Merge.rc:1281
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: Merge.rc:1282
+#: Merge.rc:1283
 #, c-format
 msgid ""
 "Plugin required\n"
 "(dllbuild %04u)"
 msgstr ""
 
-#: Merge.rc:1284
+#: Merge.rc:1285
 #, c-format
 msgid "Recommended version of 7-Zip:"
 msgstr ""
 
-#: Merge.rc:1287
-#: Merge.rc:1290
+#: Merge.rc:1288
+#: Merge.rc:1291
 #, c-format
 msgid "present"
 msgstr ""
 
-#: Merge.rc:1288
+#: Merge.rc:1289
 #, c-format
 msgid "Merge7z000U.dll"
 msgstr ""
 
-#: Merge.rc:1291
+#: Merge.rc:1292
 #, c-format
 msgid "7-Zip software installed on your computer:"
 msgstr ""
 
-#: Merge.rc:1293
-#: Merge.rc:1298
+#: Merge.rc:1294
+#: Merge.rc:1299
 #, c-format
 msgid "none"
 msgstr ""
 
-#: Merge.rc:1295
+#: Merge.rc:1296
 #, c-format
 msgid "missing"
 msgstr ""
 
-#: Merge.rc:1296
+#: Merge.rc:1297
 #, c-format
 msgid "7-Zip components for standalone operation:"
 msgstr ""
 
-#: Merge.rc:1300
+#: Merge.rc:1301
 #, c-format
 msgid "outdated"
 msgstr ""
 
-#: Merge.rc:1301
+#: Merge.rc:1302
 #, c-format
 msgid "Plugins on path:"
 msgstr ""
 
-#: Merge.rc:1302
+#: Merge.rc:1303
 #, c-format
 msgid ""
 "Don't display this &message again.\n"
 "(You can always recall this message from help menu.)"
 msgstr ""
 
-#: Merge.rc:1306
+#: Merge.rc:1307
 #, c-format
 msgid "Plugin Download"
 msgstr ""
 
-#: Merge.rc:1315
+#: Merge.rc:1316
 #, c-format
 msgid "Options"
 msgstr ""
 
-#: Merge.rc:1326
+#: Merge.rc:1327
 #, c-format
 msgid " Categories"
 msgstr ""
 
-#: Merge.rc:1328
+#: Merge.rc:1329
 #, c-format
 msgid "Import..."
 msgstr ""
 
-#: Merge.rc:1329
+#: Merge.rc:1330
 #, c-format
 msgid "Export..."
 msgstr ""
 
-#: Merge.rc:1337
+#: Merge.rc:1338
 #, c-format
 msgid "Keywords:"
 msgstr ""
 
-#: Merge.rc:1338
+#: Merge.rc:1339
 #, c-format
 msgid "Function names:"
 msgstr ""
 
-#: Merge.rc:1339
+#: Merge.rc:1340
 #, c-format
 msgid "Comments:"
 msgstr ""
 
-#: Merge.rc:1340
+#: Merge.rc:1341
 #, c-format
 msgid "Numbers:"
 msgstr ""
 
-#: Merge.rc:1341
+#: Merge.rc:1342
 #, c-format
 msgid "Operators:"
 msgstr ""
 
-#: Merge.rc:1342
+#: Merge.rc:1343
 #, c-format
 msgid "Strings:"
 msgstr ""
 
-#: Merge.rc:1343
+#: Merge.rc:1344
 #, c-format
 msgid "Preprocessor:"
 msgstr ""
 
-#: Merge.rc:1344
+#: Merge.rc:1345
 #, c-format
 msgid "User 1:"
 msgstr ""
 
-#: Merge.rc:1345
+#: Merge.rc:1346
 #, c-format
 msgid "User 2:"
 msgstr ""
 
-#: Merge.rc:1350
-#: Merge.rc:1355
-#: Merge.rc:1360
-#: Merge.rc:1365
-#: Merge.rc:1370
-#: Merge.rc:1375
-#: Merge.rc:1380
-#: Merge.rc:1385
-#: Merge.rc:1390
+#: Merge.rc:1351
+#: Merge.rc:1356
+#: Merge.rc:1361
+#: Merge.rc:1366
+#: Merge.rc:1371
+#: Merge.rc:1376
+#: Merge.rc:1381
+#: Merge.rc:1386
+#: Merge.rc:1391
 #, c-format
 msgid "Bold"
 msgstr ""
 
-#: Merge.rc:1398
+#: Merge.rc:1399
 #, c-format
 msgid "Folder Compare Report"
 msgstr "Directory Compare Report"
 
-#: Merge.rc:1401
+#: Merge.rc:1402
 #, c-format
 msgid "Report &File:"
 msgstr ""
 
-#: Merge.rc:1405
+#: Merge.rc:1406
 #, c-format
 msgid "&Style:"
 msgstr ""
 
-#: Merge.rc:1408
+#: Merge.rc:1409
 #, c-format
 msgid "&Copy to Clipboard"
 msgstr ""
 
-#: Merge.rc:1416
+#: Merge.rc:1417
 #, c-format
 msgid "Shared or Private Filter"
 msgstr ""
 
-#: Merge.rc:1419
+#: Merge.rc:1420
 #, c-format
 msgid "Which type of filter do you want to create?"
 msgstr ""
 
-#: Merge.rc:1421
+#: Merge.rc:1422
 #, c-format
 msgid "Shared Filter (for all users on this machine)"
 msgstr ""
 
-#: Merge.rc:1423
+#: Merge.rc:1424
 #, c-format
 msgid "Private Filter (only for current user)"
 msgstr ""
 
-#: Merge.rc:1431
-#: Merge.rc:1900
+#: Merge.rc:1432
+#: Merge.rc:1901
 #, c-format
 msgid "Archive Support"
 msgstr ""
 
-#: Merge.rc:1434
+#: Merge.rc:1435
 #, c-format
 msgid "Archive support requires 7-Zip plugin installed:"
 msgstr ""
 
-#: Merge.rc:1436
+#: Merge.rc:1437
 #, c-format
 msgid "Download 7-zip Plugin"
 msgstr ""
 
-#: Merge.rc:1437
+#: Merge.rc:1438
 #, c-format
 msgid "&Enable archive file support"
 msgstr ""
 
-#: Merge.rc:1439
+#: Merge.rc:1440
 #, c-format
 msgid "&Use stand-alone 7-Zip if available"
 msgstr ""
 
-#: Merge.rc:1442
+#: Merge.rc:1443
 #, c-format
 msgid "U&se local 7-Zip from WinMerge folder"
 msgstr ""
 
-#: Merge.rc:1444
+#: Merge.rc:1445
 #, c-format
 msgid "&Detect archive type from file signature"
 msgstr ""
 
-#: Merge.rc:1452
+#: Merge.rc:1453
 #, c-format
 msgid "Compare Statistics"
 msgstr ""
 
-#: Merge.rc:1455
+#: Merge.rc:1456
 #, c-format
 msgid "Folders:"
 msgstr ""
 
-#: Merge.rc:1456
+#: Merge.rc:1457
 #, c-format
 msgid "Files:"
 msgstr ""
 
-#: Merge.rc:1457
-#: Merge.rc:2264
+#: Merge.rc:1458
+#: Merge.rc:2268
 #, c-format
 msgid "Different"
 msgstr ""
 
-#: Merge.rc:1458
+#: Merge.rc:1459
 #, c-format
 msgid "Text:"
 msgstr ""
 
-#: Merge.rc:1461
-#: Merge.rc:1480
+#: Merge.rc:1462
+#: Merge.rc:1481
 #, c-format
 msgid "Binary:"
 msgstr ""
 
-#: Merge.rc:1464
+#: Merge.rc:1465
 #, c-format
 msgid "Unique"
 msgstr ""
 
-#: Merge.rc:1465
+#: Merge.rc:1466
 #, c-format
 msgid "Left:"
 msgstr ""
 
-#: Merge.rc:1470
+#: Merge.rc:1471
 #, c-format
 msgid "Right:"
 msgstr ""
 
-#: Merge.rc:1475
-#: Merge.rc:2259
+#: Merge.rc:1476
+#: Merge.rc:2263
 #, c-format
 msgid "Identical"
 msgstr "Id\xEAnticos"
 
-#: Merge.rc:1484
+#: Merge.rc:1485
 #, c-format
 msgid "Total:"
 msgstr ""
 
-#: Merge.rc:1489
+#: Merge.rc:1490
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: Merge.rc:1498
+#: Merge.rc:1499
 #, c-format
 msgid "Affects"
 msgstr ""
 
-#: Merge.rc:1501
-#: Merge.rc:1504
+#: Merge.rc:1502
+#: Merge.rc:1505
 #, c-format
 msgid "(Affects)"
 msgstr ""
 
-#: Merge.rc:1505
+#: Merge.rc:1506
 #, c-format
 msgid "Select Codepage for"
 msgstr ""
 
-#: Merge.rc:1506
+#: Merge.rc:1507
 #, c-format
 msgid "&File Loading:"
 msgstr ""
 
-#: Merge.rc:1508
-#: Merge.rc:1511
+#: Merge.rc:1509
+#: Merge.rc:1512
 #, c-format
 msgid "..."
 msgstr ""
 
-#: Merge.rc:1509
+#: Merge.rc:1510
 #, c-format
 msgid "File &Saving:"
 msgstr ""
 
-#: Merge.rc:1512
+#: Merge.rc:1513
 #, c-format
 msgid "&Use same codepage for both"
 msgstr ""
 
-#: Merge.rc:1515
+#: Merge.rc:1516
 #, c-format
 msgid "&Apply"
 msgstr ""
 
-#: Merge.rc:1516
-#: Merge.rc:1866
+#: Merge.rc:1517
+#: Merge.rc:1867
 #, c-format
 msgid "&Cancel"
 msgstr ""
 
-#: Merge.rc:1521
+#: Merge.rc:1522
 #, c-format
 msgid "Test Filter"
 msgstr ""
 
-#: Merge.rc:1524
+#: Merge.rc:1525
 #, c-format
 msgid "Testing filter ..."
 msgstr ""
 
-#: Merge.rc:1526
+#: Merge.rc:1527
 #, c-format
 msgid "&Enter text to test:"
 msgstr ""
 
-#: Merge.rc:1528
+#: Merge.rc:1529
 #, c-format
 msgid "&Folder Name"
 msgstr ""
 
-#: Merge.rc:1530
+#: Merge.rc:1531
 #, c-format
 msgid "Result:"
 msgstr ""
 
-#: Merge.rc:1534
+#: Merge.rc:1535
 #, c-format
 msgid "&Test"
 msgstr ""
 
-#: Merge.rc:1535
+#: Merge.rc:1536
 #, c-format
 msgid "&Close"
 msgstr ""
 
-#: Merge.rc:1543
+#: Merge.rc:1544
 #, c-format
 msgid "&Use customized text colors"
 msgstr ""
 
-#: Merge.rc:1546
+#: Merge.rc:1547
 #, c-format
 msgid "Custom text colors"
 msgstr ""
 
-#: Merge.rc:1548
+#: Merge.rc:1549
 #, c-format
 msgid "Whitespace:"
 msgstr ""
 
-#: Merge.rc:1549
+#: Merge.rc:1550
 #, c-format
 msgid "Regular text:"
 msgstr ""
 
-#: Merge.rc:1550
+#: Merge.rc:1551
 #, c-format
 msgid "Selection:"
 msgstr ""
 
-#: Merge.rc:1573
+#: Merge.rc:1574
 #, c-format
 msgid "Paths"
 msgstr ""
 
-#: Merge.rc:1579
+#: Merge.rc:1580
 #, c-format
 msgid "R&ead-only"
 msgstr ""
 
-#: Merge.rc:1583
+#: Merge.rc:1584
 #, c-format
 msgid "Re&ad-only"
 msgstr ""
 
-#: Merge.rc:1589
+#: Merge.rc:1590
 #, c-format
 msgid "Open..."
 msgstr ""
 
-#: Merge.rc:1590
+#: Merge.rc:1591
 #, c-format
 msgid "Save..."
 msgstr ""
 
-#: Merge.rc:1595
-#: Merge.rc:1901
+#: Merge.rc:1596
+#: Merge.rc:1902
 #, c-format
 msgid "Backup Files"
 msgstr ""
 
-#: Merge.rc:1598
+#: Merge.rc:1599
 #, c-format
 msgid "Create backup files in:"
 msgstr ""
 
-#: Merge.rc:1603
+#: Merge.rc:1604
 #, c-format
 msgid "Create backup files into:"
 msgstr ""
 
-#: Merge.rc:1604
+#: Merge.rc:1605
 #, c-format
 msgid "&Original file's folder"
 msgstr ""
 
-#: Merge.rc:1606
+#: Merge.rc:1607
 #, c-format
 msgid "&Global backup folder:"
 msgstr ""
 
-#: Merge.rc:1610
+#: Merge.rc:1611
 #, c-format
 msgid "Backup filename:"
 msgstr ""
 
-#: Merge.rc:1611
+#: Merge.rc:1612
 #, c-format
 msgid "&Append .bak -extension"
 msgstr ""
 
-#: Merge.rc:1613
+#: Merge.rc:1614
 #, c-format
 msgid "A&ppend timestamp"
 msgstr ""
 
-#: Merge.rc:1620
+#: Merge.rc:1621
 #, c-format
 msgid "Confirm Copy"
 msgstr ""
 
-#: Merge.rc:1624
+#: Merge.rc:1625
 #, c-format
 msgid "Are you sure you want to copy XXX items?"
 msgstr ""
 
-#: Merge.rc:1626
+#: Merge.rc:1627
 #, c-format
 msgid "From left"
 msgstr ""
 
-#: Merge.rc:1629
+#: Merge.rc:1630
 #, c-format
 msgid "To right"
 msgstr ""
 
-#: Merge.rc:1632
+#: Merge.rc:1633
 #, c-format
 msgid "Yes"
 msgstr ""
 
-#: Merge.rc:1633
+#: Merge.rc:1634
 #, c-format
 msgid "No"
 msgstr ""
 
 #. StringFileInfo.Block
-#: Merge.rc:1658
+#: Merge.rc:1659
 #, c-format
 msgid "040904e4"
 msgstr "041604e4"
 
 #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!
-#: Merge.rc:1660
+#: Merge.rc:1661
 #, c-format
 msgid "English translation by developers"
 msgstr "Translated by Wender Cris de Souza Firmino & Noreuzis"
 
 #. VarFileInfo.Translation
-#: Merge.rc:1673
+#: Merge.rc:1674
 #, c-format
 msgid "0x409, 1252"
 msgstr "0x416, 1252"
 
-#: Merge.rc:1688
+#: Merge.rc:1689
 #, c-format
 msgid "Ready"
 msgstr "Pronto"
 
-#: Merge.rc:1694
+#: Merge.rc:1695
 #, c-format
 msgid "EXT"
 msgstr ""
 
-#: Merge.rc:1695
+#: Merge.rc:1696
 #, c-format
 msgid "CAP"
 msgstr ""
 
-#: Merge.rc:1696
+#: Merge.rc:1697
 #, c-format
 msgid "NUM"
 msgstr ""
 
-#: Merge.rc:1697
+#: Merge.rc:1698
 #, c-format
 msgid "SCRL"
 msgstr ""
 
-#: Merge.rc:1698
+#: Merge.rc:1699
 #, c-format
 msgid "OVR"
 msgstr ""
 
-#: Merge.rc:1699
+#: Merge.rc:1700
 #, c-format
 msgid "REC"
 msgstr ""
 
-#: Merge.rc:1705
+#: Merge.rc:1706
 #, c-format
 msgid ""
 "Create empty documents\n"
 "New Documents (Ctrl+N)"
 msgstr ""
 
-#: Merge.rc:1706
+#: Merge.rc:1707
 #, c-format
 msgid ""
 "Open an existing document\n"
@@ -2603,7 +2608,7 @@
 "Abrir um documento existente\n"
 "Abrir"
 
-#: Merge.rc:1707
+#: Merge.rc:1708
 #, c-format
 msgid ""
 "Close the active document\n"
@@ -2612,7 +2617,7 @@
 "Fechar o documento ativo\n"
 "Fechar"
 
-#: Merge.rc:1708
+#: Merge.rc:1709
 #, c-format
 msgid ""
 "Save the active document\n"
@@ -2621,7 +2626,7 @@
 "Salvar o documento ativo\n"
 "Salvar"
 
-#: Merge.rc:1709
+#: Merge.rc:1710
 #, c-format
 msgid ""
 "Save the active document with a new name\n"
@@ -2630,7 +2635,7 @@
 "Salvar o documento ativo com um novo nome\n"
 "Salvar Como"
 
-#: Merge.rc:1710
+#: Merge.rc:1711
 #, c-format
 msgid ""
 "Change the printing options\n"
@@ -2639,7 +2644,7 @@
 "Alterar as configura\xE7\xF5es de impress\xE3o\n"
 "Configurar P\xE1gina"
 
-#: Merge.rc:1711
+#: Merge.rc:1712
 #, c-format
 msgid ""
 "Change the printer and printing options\n"
@@ -2648,7 +2653,7 @@
 "Alterar a impressora e as configura\xE7\xF5es de impress\xE3o\n"
 "Configurar impressora"
 
-#: Merge.rc:1712
+#: Merge.rc:1713
 #, c-format
 msgid ""
 "Print the active document\n"
@@ -2657,7 +2662,7 @@
 "Imprimir o documento ativo\n"
 "Imprimir"
 
-#: Merge.rc:1713
+#: Merge.rc:1714
 #, c-format
 msgid ""
 "Display full pages\n"
@@ -2666,51 +2671,51 @@
 "Visualizar impress\xE3o\n"
 "Visualizar Impress\xE3o"
 
-#: Merge.rc:1718
+#: Merge.rc:1719
 #, c-format
 msgid "Make all hidden items visible again"
 msgstr ""
 
-#: Merge.rc:1724
+#: Merge.rc:1725
 #, c-format
 msgid ""
 "Open project file\n"
 "Project file (Ctrl+J)"
 msgstr ""
 
-#: Merge.rc:1725
+#: Merge.rc:1726
 #, c-format
 msgid "Unknown error attempting to open project file"
 msgstr ""
 
-#: Merge.rc:1726
+#: Merge.rc:1727
 #, c-format
 msgid "Unknown error attempting to save project file"
 msgstr ""
 
-#: Merge.rc:1727
+#: Merge.rc:1728
 #, c-format
 msgid "Project File"
 msgstr ""
 
-#: Merge.rc:1728
+#: Merge.rc:1729
 #, c-format
 msgid "Project file successfully loaded."
 msgstr ""
 
-#: Merge.rc:1729
+#: Merge.rc:1730
 #, c-format
 msgid "Project file successfully saved."
 msgstr ""
 
-#: Merge.rc:1730
+#: Merge.rc:1731
 #, c-format
 msgid ""
 "Save current paths and options to project file\n"
 "Save Project File"
 msgstr ""
 
-#: Merge.rc:1735
+#: Merge.rc:1736
 #, c-format
 msgid ""
 "Display program information, version number and copyright\n"
@@ -2719,7 +2724,7 @@
 "Exibe informa\xE7\xF5es do programa, n\xFAmero da Vers\xE3o e Copyright\n"
 "Sobre"
 
-#: Merge.rc:1736
+#: Merge.rc:1737
 #, c-format
 msgid ""
 "Quit the application; prompts to save documents\n"
@@ -2728,7 +2733,6 @@
 "Sair do programa; pede para salvar documentos\n"
 "Sair"
 
-#: Merge.rc:1742
 #: Merge.rc:1743
 #: Merge.rc:1744
 #: Merge.rc:1745
@@ -2744,11 +2748,12 @@
 #: Merge.rc:1755
 #: Merge.rc:1756
 #: Merge.rc:1757
+#: Merge.rc:1758
 #, c-format
 msgid "Open this document"
 msgstr "Abrir este documento"
 
-#: Merge.rc:1762
+#: Merge.rc:1763
 #, c-format
 msgid ""
 "Switch to the next window pane\n"
@@ -2757,7 +2762,7 @@
 "Ativa o pr\xF3ximo painel\n"
 "Pr\xF3ximo Painel"
 
-#: Merge.rc:1763
+#: Merge.rc:1764
 #, c-format
 msgid ""
 "Switch back to the previous window pane\n"
@@ -2766,7 +2771,7 @@
 "Ativa o painel anterior\n"
 "Painel anterior"
 
-#: Merge.rc:1769
+#: Merge.rc:1770
 #, c-format
 msgid ""
 "Open another window for the active document\n"
@@ -2775,7 +2780,7 @@
 "Abre outra janela para o documento ativo\n"
 "Nova Janela"
 
-#: Merge.rc:1770
+#: Merge.rc:1771
 #, c-format
 msgid ""
 "Arrange icons at the bottom of the window\n"
@@ -2784,7 +2789,7 @@
 "Organiza os \xEDcones no fundo da janela\n"
 "Organiza os \xEDcones"
 
-#: Merge.rc:1771
+#: Merge.rc:1772
 #, c-format
 msgid ""
 "Arrange windows so they overlap\n"
@@ -2793,7 +2798,7 @@
 "Organiza as janelas de modo que elas se sobreponham\n"
 "Organiza em Cascata"
 
-#: Merge.rc:1772
+#: Merge.rc:1773
 #, fuzzy, c-format
 msgid ""
 "Arrange windows as non-overlapping tiles horizontally\n"
@@ -2802,7 +2807,7 @@
 "Organiza as janelas de modo que elas n\xE3o se sobreponham\n"
 "Organiza Horizontalmente"
 
-#: Merge.rc:1773
+#: Merge.rc:1774
 #, fuzzy, c-format
 msgid ""
 "Arrange windows as non-overlapping tiles vertically\n"
@@ -2811,7 +2816,7 @@
 "Organiza as janelas de modo que elas n\xE3o se sobreponham\n"
 "Organiza Verticalmente"
 
-#: Merge.rc:1774
+#: Merge.rc:1775
 #, c-format
 msgid ""
 "Split the active window into panes\n"
@@ -2820,7 +2825,7 @@
 "Divide a janela ativa em pain\xE9is\n"
 "Divide"
 
-#: Merge.rc:1780
+#: Merge.rc:1781
 #, c-format
 msgid ""
 "Erase the selection\n"
@@ -2829,7 +2834,7 @@
 "Apaga o texto selecionado\n"
 "Apaga"
 
-#: Merge.rc:1781
+#: Merge.rc:1782
 #, c-format
 msgid ""
 "Erase everything\n"
@@ -2838,7 +2843,7 @@
 "Apaga tudo\n"
 "Apaga tudo"
 
-#: Merge.rc:1782
+#: Merge.rc:1783
 #, c-format
 msgid ""
 "Copy the selection and put it on the Clipboard\n"
@@ -2847,7 +2852,7 @@
 "Copia o texto selecionado e p\xF5e na \xE1rea de Transfer\xEAncia\n"
 "Copia"
 
-#: Merge.rc:1783
+#: Merge.rc:1784
 #, c-format
 msgid ""
 "Cut the selection and put it on the Clipboard\n"
@@ -2856,7 +2861,7 @@
 "Recorta a sele\xE7\xE3o e p\xF5e na \xE1rea de Transfer\xEAncia\n"
 "Recorta"
 
-#: Merge.rc:1784
+#: Merge.rc:1785
 #, c-format
 msgid ""
 "Find the specified text\n"
@@ -2865,7 +2870,7 @@
 "Procura o texto especificado\n"
 "Procura"
 
-#: Merge.rc:1785
+#: Merge.rc:1786
 #, c-format
 msgid ""
 "Insert Clipboard contents\n"
@@ -2874,7 +2879,7 @@
 "Insere conte\xFAdo da \xE1rea de Transfer\xEAncia\n"
 "Cola"
 
-#: Merge.rc:1786
+#: Merge.rc:1787
 #, c-format
 msgid ""
 "Repeat the last action\n"
@@ -2883,7 +2888,7 @@
 "Repete a \xFAltima a\xE7\xE3o\n"
 "Repetir"
 
-#: Merge.rc:1787
+#: Merge.rc:1788
 #, c-format
 msgid ""
 "Replace specific text with different text\n"
@@ -2892,7 +2897,7 @@
 "Substitui o texto especificado por outro\n"
 "Substitui"
 
-#: Merge.rc:1788
+#: Merge.rc:1789
 #, c-format
 msgid ""
 "Select the entire document\n"
@@ -2901,7 +2906,7 @@
 "Seleciona o documento inteiro\n"
 "Seleciona Tudo"
 
-#: Merge.rc:1789
+#: Merge.rc:1790
 #, c-format
 msgid ""
 "Undo the last action\n"
@@ -2910,7 +2915,7 @@
 "Desfaz a \xFAltima a\xE7\xE3o\n"
 "Desfaz"
 
-#: Merge.rc:1790
+#: Merge.rc:1791
 #, c-format
 msgid ""
 "Redo the previously undone action\n"
@@ -2919,7 +2924,7 @@
 "Refaz a \xFAltima a\xE7\xE3o desfeita\n"
 "Refaz"
 
-#: Merge.rc:1796
+#: Merge.rc:1797
 #, c-format
 msgid ""
 "Show or hide the toolbar\n"
@@ -2928,7 +2933,7 @@
 "Exibe ou esconde a barra de ferramentas\n"
 "Chavea Barra de Ferramentas"
 
-#: Merge.rc:1797
+#: Merge.rc:1798
 #, c-format
 msgid ""
 "Show or hide the status bar\n"
@@ -2937,69 +2942,69 @@
 "Exibe ou esconde a barra de status\n"
 "Chavea Barra de Status"
 
-#: Merge.rc:1798
+#: Merge.rc:1799
 #, c-format
 msgid ""
 "Show or hide the tab bar\n"
 "Toggle TabBar"
 msgstr ""
 
-#: Merge.rc:1799
+#: Merge.rc:1800
 #, c-format
 msgid "Automatically resize panes\nLock Panes"
 msgstr ""
 
-#: Merge.rc:1805
+#: Merge.rc:1806
 #, c-format
 msgid "Change the window size"
 msgstr "Altera o tamanho da janela"
 
-#: Merge.rc:1806
+#: Merge.rc:1807
 #, c-format
 msgid "Change the window position"
 msgstr "Altera a posi\xE7\xE3o da janela"
 
-#: Merge.rc:1807
+#: Merge.rc:1808
 #, c-format
 msgid "Reduce the window to an icon"
 msgstr "Reduz a janela a um \xEDcone"
 
-#: Merge.rc:1808
+#: Merge.rc:1809
 #, c-format
 msgid "Enlarge the window to full size"
 msgstr "Aumenta o tamnho da janela ao m\xE1ximo"
 
-#: Merge.rc:1809
+#: Merge.rc:1810
 #, c-format
 msgid "Switch to the next document window"
 msgstr "Ativa a pr\xF3xima janela"
 
-#: Merge.rc:1810
+#: Merge.rc:1811
 #, c-format
 msgid "Switch to the previous document window"
 msgstr "Ativa a janela anterior"
 
-#: Merge.rc:1811
+#: Merge.rc:1812
 #, c-format
 msgid "Close the active window and prompts to save the documents"
 msgstr "Fecha a janela ativa e pede para salvar os documentos"
 
-#: Merge.rc:1816
+#: Merge.rc:1817
 #, c-format
 msgid "Restore the window to normal size"
 msgstr "Restaurar o tamanho normal da janela"
 
-#: Merge.rc:1817
+#: Merge.rc:1818
 #, c-format
 msgid "Activate Task List"
 msgstr "Ativar Lista de Tarefas"
 
-#: Merge.rc:1818
+#: Merge.rc:1819
 #, c-format
 msgid "Activate this window"
 msgstr "Ativar esta janela"
 
-#: Merge.rc:1824
+#: Merge.rc:1825
 #, c-format
 msgid ""
 "Close print preview mode\n"
@@ -3008,7 +3013,7 @@
 "Fechar a visualiza\xE7\xE3o de impress\xE3o\n"
 "Cancelar Preview"
 
-#: Merge.rc:1831
+#: Merge.rc:1832
 #, c-format
 msgid ""
 "\n"
@@ -3020,175 +3025,175 @@
 "WinMerge Document"
 msgstr ""
 
-#: Merge.rc:1838
+#: Merge.rc:1839
 #, c-format
 msgid "Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1845
+#: Merge.rc:1846
 #, c-format
 msgid "Press any key"
 msgstr ""
 
-#: Merge.rc:1851
 #: Merge.rc:1852
+#: Merge.rc:1853
 #, c-format
 msgid "Right click on the path to copy"
 msgstr ""
 
-#: Merge.rc:1858
+#: Merge.rc:1859
 #, c-format
 msgid ""
 "Developers:\n"
 "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
 msgstr ""
 
-#: Merge.rc:1859
+#: Merge.rc:1860
 #, c-format
 msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
 msgstr ""
 
-#: Merge.rc:1865
+#: Merge.rc:1866
 #, c-format
 msgid "&Ok"
 msgstr ""
 
-#: Merge.rc:1867
+#: Merge.rc:1868
 #, c-format
 msgid "&Abort"
 msgstr ""
 
-#: Merge.rc:1868
+#: Merge.rc:1869
 #, c-format
 msgid "&Retry"
 msgstr ""
 
-#: Merge.rc:1869
+#: Merge.rc:1870
 #, c-format
 msgid "&Ignore"
 msgstr ""
 
-#: Merge.rc:1870
+#: Merge.rc:1871
 #, c-format
 msgid "Ignore &all"
 msgstr ""
 
-#: Merge.rc:1871
+#: Merge.rc:1872
 #, c-format
 msgid "&Yes"
 msgstr ""
 
-#: Merge.rc:1877
+#: Merge.rc:1878
 #, c-...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge: [4934] trunk

From: <ki...@us...> - 2008-01-20 12:32:16

Revision: 4934
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4934&view=rev
Author:   kimmov
Date:     2008-01-20 04:32:14 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
PATCH: [ 1875129 ] Resolve conflict files

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/MainFrm.cpp
    trunk/Src/MainFrm.h
    trunk/Src/Merge.dsp
    trunk/Src/Merge.rc
    trunk/Src/resource.h

Added Paths:
-----------
    trunk/Src/ConflictFileParser.cpp
    trunk/Src/ConflictFileParser.h

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-20 11:42:43 UTC (rev 4933)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-20 12:32:14 UTC (rev 4934)
@@ -3,6 +3,7 @@
 to Subversion revision numbers (rXXXXX).
 
 WinMerge 2.7.7.3
+  Resolve conflict files (cvs, svn...) (#1875129)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)
 

Added: trunk/Src/ConflictFileParser.cpp
===================================================================
--- trunk/Src/ConflictFileParser.cpp	                        (rev 0)
+++ trunk/Src/ConflictFileParser.cpp	2008-01-20 12:32:14 UTC (rev 4934)
@@ -0,0 +1,256 @@
+/////////////////////////////////////////////////////////////////////////////
+//    License (GPLv2+):
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or (at
+//    your option) any later version.
+//    
+//    This program is distributed in the hope that it will be useful, but
+//    WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/** 
+ * @file  ConflictFileParser.cpp
+ *
+ * @brief Implementation for conflict file parser.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+// Modified from original code got from:
+// TortoiseCVS - a Windows shell extension for easy version control
+// Copyright (C) 2000 - Francis Irving
+// <fr...@fl...> - January 2001
+
+#include "StdAfx.h"
+#include "UnicodeString.h"
+#include "UniFile.h"
+
+#include "ConflictFileParser.h"
+
+// Parse a file
+bool ParseConflictFile(const String &conflictFileName,
+		const String &workingCopyFileName, const String &newRevisionFileName,
+		bool &bNestedConflicts)
+{
+	UniMemFile conflictFile;
+	UniStdioFile workingCopy;
+	UniStdioFile newRevision;
+	String line;
+	std::string::size_type pos;
+	int state;
+	int iNestingLevel = 0;
+	bool bResult = false;
+	bool bFirstLineNR = true;
+	bool bFirstLineWC = true;
+	String revision = _T("none");
+	bNestedConflicts = false;
+
+
+	// open input file
+	BOOL success = conflictFile.OpenReadOnly(conflictFileName.c_str());
+
+	// Create output files
+	BOOL success2 = workingCopy.Open(workingCopyFileName.c_str(), _T("w"));
+	BOOL success3 = newRevision.Open(newRevisionFileName.c_str(), _T("w"));
+
+	state = 0;
+	BOOL linesToRead = TRUE;
+	do
+	{
+		CString cline;
+		bool lossy;
+		CString eol;
+		linesToRead = conflictFile.ReadString(cline, eol, &lossy);
+		line = (LPCTSTR) cline;
+		switch (state)
+		{
+			// in common section
+		case 0:
+			// search beginning of conflict section
+			pos = line.find(_T("<<<<<<< "));
+			if (pos == 0)
+			{
+				// working copy section starts
+				state = 1;
+				bResult = true;
+			}
+			else
+			{
+				// we're in the common section, so write to both files
+				if (!bFirstLineNR)
+					newRevision.WriteString(eol);
+				else
+					bFirstLineNR = false;
+				newRevision.WriteString(line.c_str());
+
+				if (!bFirstLineWC)
+					workingCopy.WriteString(eol);
+				else
+					bFirstLineWC = false;
+				workingCopy.WriteString(line.c_str());
+			}
+			break;
+
+			// in working copy section
+		case 1:
+			// search beginning of conflict section
+			pos = line.find(_T("<<<<<<< "));
+			if (pos == 0)
+			{
+				// nested conflict section starts
+				state = 3;
+				if(!bFirstLineWC)
+					workingCopy.WriteString(eol);
+				else
+					bFirstLineWC = false;
+				workingCopy.WriteString(line.c_str());
+			}
+			else
+			{
+				pos = line.find(_T("======="));
+				if ((pos != std::string::npos) && (pos == (line.length() - 7)))
+				{
+					line = line.substr(0, pos);
+					if (!line.empty())
+					{
+						if (!bFirstLineWC)
+							workingCopy.WriteString(eol);
+						else
+							bFirstLineWC = false;
+						workingCopy.WriteString(line.c_str());
+					}
+
+					//  new revision section
+					state = 2;
+				}
+				else
+				{
+					if (!bFirstLineWC)
+						workingCopy.WriteString(eol);
+					else
+						bFirstLineWC = false;
+					workingCopy.WriteString(line.c_str());
+				}
+			}
+			break;
+
+			// in new revision section
+		case 2:
+			// search beginning of nested conflict section
+			pos = line.find(_T("<<<<<<< "));
+			if (pos == 0)
+			{
+				// nested conflict section starts
+				state = 4;
+				if (!bFirstLineNR)
+					newRevision.WriteString(eol);
+				else
+					bFirstLineNR = false;
+				newRevision.WriteString(line.c_str());
+			}
+			else
+			{
+				pos = line.find(_T(">>>>>>> "));
+				if (pos != std::string::npos)
+				{
+					revision = line.substr(pos + 8);
+					line = line.substr(0, pos);
+					if (!line.empty())
+					{
+						if (!bFirstLineNR)
+							newRevision.WriteString(eol);
+						else
+							bFirstLineNR = false;
+						newRevision.WriteString(line.c_str());
+					}
+
+					//  common section
+					state = 0;
+				}
+				else
+				{
+					if (!bFirstLineNR)
+						newRevision.WriteString(eol);
+					else
+						bFirstLineNR = false;
+					newRevision.WriteString(line.c_str());
+				}
+			}
+			break;
+
+
+			// in nested section in working copy section
+		case 3:
+			// search beginning of nested conflict section
+			bNestedConflicts = true;
+			pos = line.find(_T("<<<<<<< "));
+			if (pos == 0)
+			{
+				iNestingLevel++;
+			}
+			else
+			{
+				pos = line.find(_T(">>>>>>> "));
+				if (pos != std::string::npos)
+				{
+					if (iNestingLevel == 0)
+					{
+						state = 1;
+					}
+					else
+					{
+						iNestingLevel--;
+					}
+				}
+			}
+			if (!bFirstLineWC)
+				workingCopy.WriteString(eol);
+			else
+				bFirstLineWC = false;
+			workingCopy.WriteString(line.c_str());
+			break;
+
+			// in nested section in new revision section
+		case 4:
+			// search beginning of nested conflict section
+			pos = line.find(_T("<<<<<<< "));
+			if (pos == 0)
+			{
+				iNestingLevel++;
+			}
+			else
+			{
+				pos = line.find(_T(">>>>>>> "));
+				if (pos != std::string::npos)
+				{
+					if (iNestingLevel == 0)
+					{
+						state = 2;
+					}
+					else
+					{
+						iNestingLevel--;
+					}
+				}
+			}
+			if (!bFirstLineNR)
+				newRevision.WriteString(eol);
+			else
+				bFirstLineNR = false;
+			newRevision.WriteString(line.c_str());
+			break;
+		}
+	} while (linesToRead);
+
+	// Close
+	newRevision.Close();
+	workingCopy.Close();
+	conflictFile.Close();
+	return bResult;
+}


Property changes on: trunk/Src/ConflictFileParser.cpp
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/Src/ConflictFileParser.h
===================================================================
--- trunk/Src/ConflictFileParser.h	                        (rev 0)
+++ trunk/Src/ConflictFileParser.h	2008-01-20 12:32:14 UTC (rev 4934)
@@ -0,0 +1,35 @@
+/////////////////////////////////////////////////////////////////////////////
+//    License (GPLv2+):
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful, but
+//    WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/** 
+ * @file  ConflictFileParser.h
+ *
+ * @brief Declaration ConflictFileParser.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+// Modified from original code got from:
+// TortoiseCVS - a Windows shell extension for easy version control
+// Copyright (C) 2000 - Francis Irving
+// <fr...@fl...> - January 2001
+
+
+#include "UnicodeString.h"
+
+bool ParseConflictFile(const String &conflictFileName,
+		const String &workingCopyFileName, const String &newRevisionFileName,
+		bool &nestedConflicts);


Property changes on: trunk/Src/ConflictFileParser.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp	2008-01-20 11:42:43 UTC (rev 4933)
+++ trunk/Src/MainFrm.cpp	2008-01-20 12:32:14 UTC (rev 4934)
@@ -27,7 +27,7 @@
 // $Id$
 
 #include "stdafx.h"
-
+#include <vector>
 #include <htmlhelp.h>  // From HTMLHelp Workshop (incl. in Platform SDK)
 #include <shlwapi.h>
 #include "Merge.h"
@@ -44,7 +44,7 @@
 #include "LocationView.h"
 #include "SyntaxColors.h"
 #include "LineFiltersList.h"
-
+#include "ConflictFileParser.h"
 #include "coretools.h"
 #include "Splash.h"
 #include "PropLineFilter.h"
@@ -89,6 +89,8 @@
 
 static void LoadToolbarImageList(CMainFrame::TOOLBAR_SIZE size, UINT nIDResource, CImageList& ImgList);
 
+using namespace std;
+
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame
 
@@ -165,6 +167,7 @@
 	ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
 	ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
 	ON_COMMAND(ID_HELP_RELEASENOTES, OnHelpReleasenotes)
+	ON_COMMAND(ID_FILE_OPENCONFLICT, OnFileOpenConflict)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -261,6 +264,15 @@
 	// Delete all temporary folders belonging to this process
 	GetClearTempPath(NULL, NULL);
 
+	// Remove files from temp file list.
+	while (!m_tempFiles.empty())
+	{
+		TempFile *temp = m_tempFiles.back();
+		temp->Delete();
+		delete temp;
+		m_tempFiles.pop_back();
+	}
+
 	delete m_pLineFilters;
 	delete m_pMenus[MENU_DEFAULT];
 	delete m_pMenus[MENU_MERGEVIEW];
@@ -3434,3 +3446,48 @@
 	String sPath = GetModulePath(0) + RelNotes;
 	ShellExecute(NULL, _T("open"), sPath.c_str(), NULL, NULL, SW_SHOWNORMAL);
 }
+
+/**
+ * @brief Select and open conflict file for resolving.
+ * This function lets user to select conflict file to resolve.
+ * Then we parse conflict file to two files to "merge" and
+ * save resulting file over original file.
+ */
+void CMainFrame::OnFileOpenConflict()
+{
+	CString conflictFile;
+	if (SelectFile(GetSafeHwnd(), conflictFile))
+	{
+		String confl = (LPCTSTR)conflictFile;
+		
+		// Create temp files and put them into the list,
+		// from where they get deleted when MainFrame is deleted.
+		TempFile *wTemp = new TempFile();
+		String workFile = wTemp->Create(_T("confw_"));
+		m_tempFiles.push_back(wTemp);
+		TempFile *vTemp = new TempFile();
+		String revFile = vTemp->Create(_T("confv_"));
+		m_tempFiles.push_back(vTemp);
+
+		// Parse conflict file into two files.
+		bool inners;
+		bool success = ParseConflictFile(confl, workFile, revFile, inners);
+
+		if (success)
+		{
+			// Open two parsed files to WinMerge, telling WinMerge to
+			// save over original file (given as third filename).
+			m_strSaveAsPath = conflictFile;
+			String theirs = LoadResString(IDS_CONFLICT_THEIRS_FILE);
+			String my = LoadResString(IDS_CONFLICT_MINE_FILE);
+			m_strDescriptions[0] = theirs;
+			m_strDescriptions[1] = my;
+			DoFileOpen(workFile.c_str(), revFile.c_str(), 
+					FFILEOPEN_READONLY |FFILEOPEN_NOMRU, FFILEOPEN_NOMRU );
+		}
+		else
+		{
+			LangMessageBox(IDS_ERROR_CONF_RESOLVE, MB_ICONSTOP);
+		}
+	}
+}

Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h	2008-01-20 11:42:43 UTC (rev 4933)
+++ trunk/Src/MainFrm.h	2008-01-20 12:32:14 UTC (rev 4934)
@@ -29,6 +29,7 @@
 #if !defined(AFX_MAINFRM_H__BBCD4F8C_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
 #define AFX_MAINFRM_H__BBCD4F8C_34E4_11D1_BAA6_00A024706EDC__INCLUDED_
 
+#include <vector>
 #include "ToolBarXPThemes.h"
 #include "MDITabBar.h"
 #include "OptionsMgr.h"
@@ -37,6 +38,8 @@
 
 #define BACKUP_FILE_EXT   _T(".bak")
 
+using namespace std;
+
 /**
  * @brief Flags used when opening files
  */
@@ -71,6 +74,7 @@
 class CMergeDiffDetailView;
 class SyntaxColors;
 class LineFiltersList;
+class TempFile;
 
 
 // typed lists (homogenous pointer lists)
@@ -226,6 +230,7 @@
 	};
 	BCMenu * m_pMenus[MENU_COUNT]; /**< Menus for different views */
 	SyntaxColors *m_pSyntaxColors; /**< Syntax color container */
+	std::vector<TempFile*> m_tempFiles; /**< List of possibly needed temp files. */
 
 // Generated message map functions
 protected:
@@ -317,6 +322,7 @@
 	void LoadToolbarImages();
 public:
 	afx_msg void OnHelpReleasenotes();
+	afx_msg void OnFileOpenConflict();
 };
 
 CMainFrame * GetMainFrame(); // access to the singleton main frame object

Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp	2008-01-20 11:42:43 UTC (rev 4933)
+++ trunk/Src/Merge.dsp	2008-01-20 12:32:14 UTC (rev 4934)
@@ -269,6 +269,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\ConflictFileParser.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\Common\coretools.cpp
 # ADD CPP /YX
 # End Source File
@@ -1101,6 +1105,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\ConflictFileParser.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Common\coretools.h
 # End Source File
 # Begin Source File

Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc	2008-01-20 11:42:43 UTC (rev 4933)
+++ trunk/Src/Merge.rc	2008-01-20 12:32:14 UTC (rev 4934)
@@ -111,6 +111,7 @@
     BEGIN
         MENUITEM "&New\tCtrl+N",                ID_FILE_NEW
         MENUITEM "&Open...\tCtrl+O",            ID_FILE_OPEN
+        MENUITEM "Op&en Conflict File...",      ID_FILE_OPENCONFLICT
         MENUITEM SEPARATOR
         MENUITEM "Open Project...\tCtrl+J",     ID_FILE_OPENPROJECT
         MENUITEM "Sa&ve Project...",            ID_FILE_SAVEPROJECT
@@ -2006,6 +2007,8 @@
     IDS_FILE_COMPARISON_TITLE "File Comparison"
     IDS_EMPTY_LEFT_FILE     "Untitled left"
     IDS_EMPTY_RIGHT_FILE    "Untitled right"
+    IDS_CONFLICT_THEIRS_FILE "Theirs File"
+    IDS_CONFLICT_MINE_FILE   "Mine File"
 END
 
 // STATUS BAR : CURRENT OPERATION STATUS
@@ -2065,6 +2068,7 @@
     IDS_BINFILES_DIFFERENT   "%1\n%2\n\nare different binary files."
     IDS_OTHER_IS_BINARY      "%1\n\nis binary file. Cannot compare binary and text files."
     IDS_ERROR_FILEOPEN       "Cannot open file\n%1\n\n%2"
+    IDS_ERROR_CONF_RESOLVE  "Failed to parse conflict file."
 END
 
 // SAVING FILE
@@ -2751,6 +2755,7 @@
     ID_EOL_TO_MAC           "Convert EOL to MAC mode"
     ID_FILE_MERGINGMODE     "Switch between editing and merging modes"
     ID_FILE_ENCODING        "View and adjust file encoding properties\nFile encoding properties"
+    ID_FILE_OPENCONFLICT    "Open and resolve conflict file"
 END
 
 // EDIT MENU

Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h	2008-01-20 11:42:43 UTC (rev 4933)
+++ trunk/Src/resource.h	2008-01-20 12:32:14 UTC (rev 4934)
@@ -515,6 +515,8 @@
 #define IDS_FILE_COMPARISON_TITLE       16801
 #define IDS_EMPTY_LEFT_FILE             16802
 #define IDS_EMPTY_RIGHT_FILE            16803
+#define IDS_CONFLICT_THEIRS_FILE        16804
+#define IDS_CONFLICT_MINE_FILE          16805
 #define IDS_STATUS_RESCANNING           16816
 #define IDS_STATUS_OPENING_SELECTION    16817
 #define IDS_STATUS_COPYL2R              16818
@@ -549,6 +551,7 @@
 #define IDS_BINFILES_DIFFERENT          17219
 #define IDS_OTHER_IS_BINARY             17220
 #define IDS_ERROR_FILEOPEN              17221
+#define IDS_ERROR_CONF_RESOLVE          17222
 #define IDS_SAVE_AS_TITLE               17232
 #define IDS_SAVE_FMT                    17233
 #define IDS_SAVEREADONLY_FMT            17234
@@ -1093,6 +1096,7 @@
 #define ID_VIEW_SWAPPANES               33097
 #define ID_FILE_SAVEPROJECT             33098
 #define ID_FILE_ENCODING                33100
+#define ID_FILE_OPENCONFLICT            33101
 #define IDS_FILES_AFFECTED_FMT          33110
 #define IDS_FILES_AFFECTED_FMT2         33111
 #define IDS_AUTOCOMPLETE_DISABLED       33112


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [4933] trunk/Docs/Users/ChangeLog.txt

From: <ki...@us...> - 2008-01-20 11:42:45

Revision: 4933
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4933&view=rev
Author:   kimmov
Date:     2008-01-20 03:42:43 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
Changelog: Bugfix: Clipped text in file saving error message (#1874854)

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-20 08:48:53 UTC (rev 4932)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-20 11:42:43 UTC (rev 4933)
@@ -3,7 +3,8 @@
 to Subversion revision numbers (rXXXXX).
 
 WinMerge 2.7.7.3
-  BugFix: Fix Quick Compare regression in 2.7.7.2
+  BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
+  Bugfix: Clipped text in file saving error message (#1874854)
 
 WinMerge 2.7.7.2 - 2008-01-14 (r4915)
   Syntax highlighting for PowerShell files (#1859657)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 message has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 104 105 106 107 108 .. 163 > >> (Page 106 of 163)