Menu
▾
▴
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
|
|
From: <sdo...@us...> - 2019-08-25 11:29:10
|
Revision: 7621
http://sourceforge.net/p/winmerge/code/7621
Author: sdottaka
Date: 2019-08-25 11:29:08 +0000 (Sun, 25 Aug 2019)
Log Message:
-----------
WinMerge project moved to GitHub (https://github.com/WinMerge/winmerge)
Added Paths:
-----------
trunk/moved_to_github.txt
Removed Paths:
-------------
trunk/moved_to_bitbucket.txt
Deleted: trunk/moved_to_bitbucket.txt
===================================================================
--- trunk/moved_to_bitbucket.txt 2018-10-29 22:50:14 UTC (rev 7620)
+++ trunk/moved_to_bitbucket.txt 2019-08-25 11:29:08 UTC (rev 7621)
@@ -1 +0,0 @@
-https://bitbucket.org/winmerge/winmerge
\ No newline at end of file
Copied: trunk/moved_to_github.txt (from rev 7620, trunk/moved_to_bitbucket.txt)
===================================================================
--- trunk/moved_to_github.txt (rev 0)
+++ trunk/moved_to_github.txt 2019-08-25 11:29:08 UTC (rev 7621)
@@ -0,0 +1 @@
+https://github.com/WinMerge/winmerge
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2018-10-29 22:50:16
|
Revision: 7620
http://sourceforge.net/p/winmerge/code/7620
Author: sdottaka
Date: 2018-10-29 22:50:14 +0000 (Mon, 29 Oct 2018)
Log Message:
-----------
WinMerge moved to https://bitbucket.org/winmerge/winmerge
Added Paths:
-----------
trunk/moved_to_bitbucket.txt
trunk/old/
trunk/old/ArchiveSupport/
trunk/old/Docs/
trunk/old/Externals/
trunk/old/Filters/
trunk/old/Installer/
trunk/old/Plugins/
trunk/old/ShellExtension/
trunk/old/Src/
trunk/old/Testing/
trunk/old/Tools/
trunk/old/Translations/
trunk/old/WinMerge.sln
trunk/old/WinMergeX64.sln
trunk/old/readme.txt
trunk/old/runastyle.bat
trunk/old/versions.ini
Removed Paths:
-------------
trunk/ArchiveSupport/
trunk/Docs/
trunk/Externals/
trunk/Filters/
trunk/Installer/
trunk/Plugins/
trunk/ShellExtension/
trunk/Src/
trunk/Testing/
trunk/Tools/
trunk/Translations/
trunk/WinMerge.sln
trunk/WinMergeX64.sln
trunk/readme.txt
trunk/runastyle.bat
trunk/versions.ini
Deleted: trunk/WinMerge.sln
===================================================================
--- trunk/WinMerge.sln 2016-10-01 11:56:05 UTC (rev 7619)
+++ trunk/WinMerge.sln 2018-10-29 22:50:14 UTC (rev 7620)
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vcproj", "{2A81DB64-C062-48AF-8D2E-23B68320142D}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- UnicodeDebug|Win32 = UnicodeDebug|Win32
- UnicodeRelease|Win32 = UnicodeRelease|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {2A81DB64-C062-48AF-8D2E-23B68320142D}.UnicodeDebug|Win32.ActiveCfg = UnicodeDebug|Win32
- {2A81DB64-C062-48AF-8D2E-23B68320142D}.UnicodeDebug|Win32.Build.0 = UnicodeDebug|Win32
- {2A81DB64-C062-48AF-8D2E-23B68320142D}.UnicodeRelease|Win32.ActiveCfg = UnicodeRelease|Win32
- {2A81DB64-C062-48AF-8D2E-23B68320142D}.UnicodeRelease|Win32.Build.0 = UnicodeRelease|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: trunk/WinMergeX64.sln
===================================================================
--- trunk/WinMergeX64.sln 2016-10-01 11:56:05 UTC (rev 7619)
+++ trunk/WinMergeX64.sln 2018-10-29 22:50:14 UTC (rev 7620)
@@ -1,73 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\MergeX64.vcproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"
- ProjectSection(ProjectDependencies) = postProject
- {D6B50065-7185-4E20-A499-E78276066E6F} = {D6B50065-7185-4E20-A499-E78276066E6F}
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1} = {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}
- {D87729EA-38DF-4025-AA98-22F2438DF995} = {D87729EA-38DF-4025-AA98-22F2438DF995}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "Externals\expat\lib\expatX64.vcproj", "{657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "Externals\pcre\Win32\pcreX64.vcproj", "{D6B50065-7185-4E20-A499-E78276066E6F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scew", "Externals\scew\win32\scewX64.vcproj", "{D87729EA-38DF-4025-AA98-22F2438DF995}"
- ProjectSection(ProjectDependencies) = postProject
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1} = {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLangX64.vcproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug Unicode|Win32 = Debug Unicode|Win32
- Debug Unicode|x64 = Debug Unicode|x64
- Release Unicode|Win32 = Release Unicode|Win32
- Release Unicode|x64 = Release Unicode|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode|Win32.Build.0 = Debug|Win32
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode|x64.ActiveCfg = Debug|x64
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode|x64.Build.0 = Debug|x64
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode|Win32.ActiveCfg = Release|Win32
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode|Win32.Build.0 = Release|Win32
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode|x64.ActiveCfg = Release|x64
- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode|x64.Build.0 = Release|x64
- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode|Win32.Build.0 = Debug|Win32
- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode|x64.ActiveCfg = Debug|x64
- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode|x64.Build.0 = Debug|x64
- {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode|Win32.ActiveCfg = MinSizeRel|Win32
- {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode|Win32.Build.0 = MinSizeRel|Win32
- {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode|x64.ActiveCfg = MinSizeRel|x64
- {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode|x64.Build.0 = MinSizeRel|x64
- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode|Win32.Build.0 = Debug|Win32
- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode|x64.ActiveCfg = Debug|x64
- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode|x64.Build.0 = Debug|x64
- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode|Win32.ActiveCfg = Release|Win32
- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode|Win32.Build.0 = Release|Win32
- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode|x64.ActiveCfg = Release|x64
- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode|x64.Build.0 = Release|x64
- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
- {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
- {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
- {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
- {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Added: trunk/moved_to_bitbucket.txt
===================================================================
--- trunk/moved_to_bitbucket.txt (rev 0)
+++ trunk/moved_to_bitbucket.txt 2018-10-29 22:50:14 UTC (rev 7620)
@@ -0,0 +1 @@
+https://bitbucket.org/winmerge/winmerge
\ No newline at end of file
Copied: trunk/old/WinMerge.sln (from rev 7619, trunk/WinMerge.sln)
===================================================================
--- trunk/old/WinMerge.sln (rev 0)
+++ trunk/old/WinMerge.sln 2018-10-29 22:50:14 UTC (rev 7620)
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vcproj", "{2A81DB64-C062-48AF-8D2E-23B68320142D}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ UnicodeDebug|Win32 = UnicodeDebug|Win32
+ UnicodeRelease|Win32 = UnicodeRelease|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {2A81DB64-C062-48AF-8D2E-23B68320142D}.UnicodeDebug|Win32.ActiveCfg = UnicodeDebug|Win32
+ {2A81DB64-C062-48AF-8D2E-23B68320142D}.UnicodeDebug|Win32.Build.0 = UnicodeDebug|Win32
+ {2A81DB64-C062-48AF-8D2E-23B68320142D}.UnicodeRelease|Win32.ActiveCfg = UnicodeRelease|Win32
+ {2A81DB64-C062-48AF-8D2E-23B68320142D}.UnicodeRelease|Win32.Build.0 = UnicodeRelease|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Copied: trunk/old/WinMergeX64.sln (from rev 7619, trunk/WinMergeX64.sln)
===================================================================
--- trunk/old/WinMergeX64.sln (rev 0)
+++ trunk/old/WinMergeX64.sln 2018-10-29 22:50:14 UTC (rev 7620)
@@ -0,0 +1,73 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\MergeX64.vcproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D6B50065-7185-4E20-A499-E78276066E6F} = {D6B50065-7185-4E20-A499-E78276066E6F}
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1} = {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}
+ {D87729EA-38DF-4025-AA98-22F2438DF995} = {D87729EA-38DF-4025-AA98-22F2438DF995}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "Externals\expat\lib\expatX64.vcproj", "{657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "Externals\pcre\Win32\pcreX64.vcproj", "{D6B50065-7185-4E20-A499-E78276066E6F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scew", "Externals\scew\win32\scewX64.vcproj", "{D87729EA-38DF-4025-AA98-22F2438DF995}"
+ ProjectSection(ProjectDependencies) = postProject
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1} = {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLangX64.vcproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug Unicode|Win32 = Debug Unicode|Win32
+ Debug Unicode|x64 = Debug Unicode|x64
+ Release Unicode|Win32 = Release Unicode|Win32
+ Release Unicode|x64 = Release Unicode|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode|Win32.Build.0 = Debug|Win32
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode|x64.ActiveCfg = Debug|x64
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode|x64.Build.0 = Debug|x64
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode|Win32.ActiveCfg = Release|Win32
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode|Win32.Build.0 = Release|Win32
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode|x64.ActiveCfg = Release|x64
+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode|x64.Build.0 = Release|x64
+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode|Win32.Build.0 = Debug|Win32
+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode|x64.ActiveCfg = Debug|x64
+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode|x64.Build.0 = Debug|x64
+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode|Win32.ActiveCfg = MinSizeRel|Win32
+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode|Win32.Build.0 = MinSizeRel|Win32
+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode|x64.ActiveCfg = MinSizeRel|x64
+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode|x64.Build.0 = MinSizeRel|x64
+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode|Win32.Build.0 = Debug|Win32
+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode|x64.ActiveCfg = Debug|x64
+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode|x64.Build.0 = Debug|x64
+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode|Win32.ActiveCfg = Release|Win32
+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode|Win32.Build.0 = Release|Win32
+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode|x64.ActiveCfg = Release|x64
+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode|x64.Build.0 = Release|x64
+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Copied: trunk/old/readme.txt (from rev 7619, trunk/readme.txt)
===================================================================
--- trunk/old/readme.txt (rev 0)
+++ trunk/old/readme.txt 2018-10-29 22:50:14 UTC (rev 7620)
@@ -0,0 +1,60 @@
+WinMerge\readme.txt
+
+Source code for the WinMerge program, its plugins, filters, setup program,
+and various utilities are all kept in various subfolders listed below.
+
+Changelog file is in Docs/Users/ChangeLog.txt and it logs user-visible
+or otherwise significant changes. Subversion commit messages provide a
+detailed changelog for all the changes. Commit messages also have a
+SourceForge.net tracker number mentioned when the commit is related to
+one of the tracker items.
+
+Subfolders include:
+
+ - Docs
+ Both user and developer documentation, in different subfolders.
+ Can be browsed by opening index.html in Docs folder.
+
+ - Src
+ source code to the WinMerge program itself
+
+ - Plugins
+ source code and binaries for WinMerge runtime plugin dlls & scripts
+
+ - Filters
+ WinMerge file filters which are shipped with the distribution
+
+ - ArchiveSupport
+ source code for the Merge7z dlls, which connect WinMerge with 7-Zip
+ Also this folder is required to compile WinMerge(U).exe. There
+ is also standalone installer for Merge7z dlls.
+
+ - Externals
+ This folder contains several libraries whose sources come from
+ outside WinMerge project. They are stored here for convenience for
+ building and possible needed small changes for WinMerge. Libraries
+ include XML parser and regular expression parser.
+
+ - Installer
+ Installer for WinMerge
+
+ - Tools
+ Various utilities used by WinMerge developers; see readme files in each
+
+ - ShellExtension
+ Windows shell (Explorer) integration. Adds menuitems to Explorer context
+ menu for comparing files and folders.
+
+ - Testing
+ A suite of test diff files and a script to run them and report the results.
+ This folder also has 'Google Test' subfolder containing unit tests made
+ with Google Test -framework.
+
+ - Build
+ This folder gets created by compiler when WinMerge is compiled. It
+ contains compiled executables, libraries, user manual etc.
+
+ - BuildTmp
+ This folder gets created by compiler when WinMerge is compiled. It
+ contains temporary files created during the compilation and can be safely
+ removed.
Copied: trunk/old/runastyle.bat (from rev 7619, trunk/runastyle.bat)
===================================================================
--- trunk/old/runastyle.bat (rev 0)
+++ trunk/old/runastyle.bat 2018-10-29 22:50:14 UTC (rev 7620)
@@ -0,0 +1,21 @@
+REM Run Astyle to format source code
+REM Get Astyle from:
+REM http://astyle.sourceforge.net/
+REM $Id$
+
+REM Src is Ansi-style - tab-indent
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/*.cpp
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/*.h
+
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/Common/*.cpp
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/Common/*.h
+
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/CompareEngines/*.cpp
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/CompareEngines/*.h
+
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks ShellExtension/*.cpp
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks ShellExtension/*.h
+
+REM Editor code is GNU style - 2 space indent
+astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.cpp
+astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.h
Copied: trunk/old/versions.ini (from rev 7619, trunk/versions.ini)
===================================================================
--- trunk/old/versions.ini (rev 0)
+++ trunk/old/versions.ini 2018-10-29 22:50:14 UTC (rev 7620)
@@ -0,0 +1,29 @@
+; versions.ini - version numbers for WinMerge components
+; Use Tools/Scripts/SetVersions.py script to set the version numbers
+; $Id$
+
+[Installer]
+type = InnoSetup
+description = WinMerge InnoSetup installer
+path = Installer/InnoSetup/WinMerge.iss
+macro = AppVersion
+version = "2.15.1"
+
+[Executable]
+type = WinRC
+description = WinMerge executable
+path = Src/Merge.rc
+version = "2.15.1"
+
+[Dll]
+type = WinRC
+description = ShellExtension
+path = ShellExtension/ShellExtension.rc
+version = "1.16.3"
+
+[Manual]
+type = Docbook
+description = WinMerge manual
+path = Docs/Users/Manual/WinMerge_help.xml
+tag = releaseinfo
+versionstring = <emphasis>Revision 1.6.3</emphasis>
Deleted: trunk/readme.txt
===================================================================
--- trunk/readme.txt 2016-10-01 11:56:05 UTC (rev 7619)
+++ trunk/readme.txt 2018-10-29 22:50:14 UTC (rev 7620)
@@ -1,60 +0,0 @@
-WinMerge\readme.txt
-
-Source code for the WinMerge program, its plugins, filters, setup program,
-and various utilities are all kept in various subfolders listed below.
-
-Changelog file is in Docs/Users/ChangeLog.txt and it logs user-visible
-or otherwise significant changes. Subversion commit messages provide a
-detailed changelog for all the changes. Commit messages also have a
-SourceForge.net tracker number mentioned when the commit is related to
-one of the tracker items.
-
-Subfolders include:
-
- - Docs
- Both user and developer documentation, in different subfolders.
- Can be browsed by opening index.html in Docs folder.
-
- - Src
- source code to the WinMerge program itself
-
- - Plugins
- source code and binaries for WinMerge runtime plugin dlls & scripts
-
- - Filters
- WinMerge file filters which are shipped with the distribution
-
- - ArchiveSupport
- source code for the Merge7z dlls, which connect WinMerge with 7-Zip
- Also this folder is required to compile WinMerge(U).exe. There
- is also standalone installer for Merge7z dlls.
-
- - Externals
- This folder contains several libraries whose sources come from
- outside WinMerge project. They are stored here for convenience for
- building and possible needed small changes for WinMerge. Libraries
- include XML parser and regular expression parser.
-
- - Installer
- Installer for WinMerge
-
- - Tools
- Various utilities used by WinMerge developers; see readme files in each
-
- - ShellExtension
- Windows shell (Explorer) integration. Adds menuitems to Explorer context
- menu for comparing files and folders.
-
- - Testing
- A suite of test diff files and a script to run them and report the results.
- This folder also has 'Google Test' subfolder containing unit tests made
- with Google Test -framework.
-
- - Build
- This folder gets created by compiler when WinMerge is compiled. It
- contains compiled executables, libraries, user manual etc.
-
- - BuildTmp
- This folder gets created by compiler when WinMerge is compiled. It
- contains temporary files created during the compilation and can be safely
- removed.
Deleted: trunk/runastyle.bat
===================================================================
--- trunk/runastyle.bat 2016-10-01 11:56:05 UTC (rev 7619)
+++ trunk/runastyle.bat 2018-10-29 22:50:14 UTC (rev 7620)
@@ -1,21 +0,0 @@
-REM Run Astyle to format source code
-REM Get Astyle from:
-REM http://astyle.sourceforge.net/
-REM $Id$
-
-REM Src is Ansi-style - tab-indent
-astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/*.cpp
-astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/*.h
-
-astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/Common/*.cpp
-astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/Common/*.h
-
-astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/CompareEngines/*.cpp
-astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/CompareEngines/*.h
-
-astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks ShellExtension/*.cpp
-astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks ShellExtension/*.h
-
-REM Editor code is GNU style - 2 space indent
-astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.cpp
-astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.h
Deleted: trunk/versions.ini
===================================================================
--- trunk/versions.ini 2016-10-01 11:56:05 UTC (rev 7619)
+++ trunk/versions.ini 2018-10-29 22:50:14 UTC (rev 7620)
@@ -1,29 +0,0 @@
-; versions.ini - version numbers for WinMerge components
-; Use Tools/Scripts/SetVersions.py script to set the version numbers
-; $Id$
-
-[Installer]
-type = InnoSetup
-description = WinMerge InnoSetup installer
-path = Installer/InnoSetup/WinMerge.iss
-macro = AppVersion
-version = "2.15.1"
-
-[Executable]
-type = WinRC
-description = WinMerge executable
-path = Src/Merge.rc
-version = "2.15.1"
-
-[Dll]
-type = WinRC
-description = ShellExtension
-path = ShellExtension/ShellExtension.rc
-version = "1.16.3"
-
-[Manual]
-type = Docbook
-description = WinMerge manual
-path = Docs/Users/Manual/WinMerge_help.xml
-tag = releaseinfo
-versionstring = <emphasis>Revision 1.6.3</emphasis>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2016-10-01 11:56:08
|
Revision: 7619
http://sourceforge.net/p/winmerge/code/7619
Author: sdottaka
Date: 2016-10-01 11:56:05 +0000 (Sat, 01 Oct 2016)
Log Message:
-----------
Update Portuguese translation. Submitted by Lippe35
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Translations/WinMerge/Portuguese.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2013-03-31 22:28:55 UTC (rev 7618)
+++ trunk/Docs/Users/ChangeLog.txt 2016-10-01 11:56:05 UTC (rev 7619)
@@ -39,6 +39,7 @@
- Dutch (patches:#3020)
- Slovenian (patches:#3022)
- Italian (patches:#3028)
+ - Portuguese
WinMerge 2.13.14 - 2010-09-15 (r7263)
Update release compiler and runtimes to VS2008
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2013-03-31 22:28:55 UTC (rev 7618)
+++ trunk/Docs/Users/Contributors.txt 2016-10-01 11:56:05 UTC (rev 7619)
@@ -107,6 +107,7 @@
* Portuguese (Portugal):
Nelson Sim\xE3o
+ Lippe35
* Romanian:
Cristian Arghiroiu <cri...@gm...>
Modified: trunk/Translations/WinMerge/Portuguese.po
===================================================================
--- trunk/Translations/WinMerge/Portuguese.po 2013-03-31 22:28:55 UTC (rev 7618)
+++ trunk/Translations/WinMerge/Portuguese.po 2016-10-01 11:56:05 UTC (rev 7619)
@@ -3,6 +3,7 @@
#
# Translators:
# * Nelson Sim\xE3o
+# * Lippe35
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -13,7 +14,7 @@
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
-"Last-Translator: Nelson Sim\xE3o\n"
+"Last-Translator: Lippe35\n"
"Language-Team: Portuguese <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
@@ -40,18 +41,18 @@
#: Merge.rc:99
#, c-format
msgid "C&opy to Right"
-msgstr "C&opiar para a direita"
+msgstr "C&opiar para a Direita"
#: Merge.rc:73
#: Merge.rc:100
#, c-format
msgid "Cop&y to Left"
-msgstr "C&opiar para a esquerda"
+msgstr "C&opiar para a Esquerda"
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "&Seleccionar diferen\xE7as de linha"
+msgstr "&Seleccionar Diferen\xE7as de Linha"
#: Merge.rc:77
#, c-format
@@ -140,26 +141,26 @@
#: Merge.rc:319
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Ab&rir Ficheiro de Conflito..."
#: Merge.rc:116
#: Merge.rc:200
#: Merge.rc:321
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr "Abrir pro&jecto...\Ctrl+J"
+msgstr "Abrir Pro&jecto...\Ctrl+J"
#: Merge.rc:117
#: Merge.rc:201
#: Merge.rc:322
#, c-format
msgid "Sa&ve Project..."
-msgstr "&Guardar projecto..."
+msgstr "&Guardar Projecto..."
#: Merge.rc:119
#, c-format
msgid "Recent Projects"
-msgstr ""
+msgstr "Projectos Recentes"
#: Merge.rc:121
#: Merge.rc:208
@@ -215,21 +216,21 @@
#: Merge.rc:418
#, c-format
msgid "&None"
-msgstr ""
+msgstr "&Nenhum"
#: Merge.rc:135
#: Merge.rc:237
#: Merge.rc:419
#, c-format
msgid "&Small"
-msgstr ""
+msgstr "&Pequeno"
#: Merge.rc:136
#: Merge.rc:238
#: Merge.rc:420
#, c-format
msgid "&Big"
-msgstr ""
+msgstr "&Grande"
#: Merge.rc:138
#: Merge.rc:240
@@ -243,7 +244,7 @@
#: Merge.rc:423
#, c-format
msgid "Ta&b Bar"
-msgstr ""
+msgstr "Barra de tabula\xE7\xF5es"
#: Merge.rc:141
#: Merge.rc:244
@@ -271,7 +272,7 @@
#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
-msgstr "&Gerar ficheiro patch..."
+msgstr "&A gerar patch..."
#: Merge.rc:148
#: Merge.rc:272
@@ -290,12 +291,12 @@
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "Divis\xE3o manual"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "Divis\xE3o autom\xE1tica"
#: Merge.rc:155
#: Merge.rc:276
@@ -309,7 +310,7 @@
#: Merge.rc:460
#, c-format
msgid "&Automatic Unpacking"
-msgstr "Extrac\xE7\xE3o autom\xE1tica"
+msgstr "E&xtrac\xE7\xE3o autom\xE1tica"
#: Merge.rc:158
#: Merge.rc:279
@@ -358,14 +359,14 @@
#: Merge.rc:478
#, c-format
msgid "Cl&ose"
-msgstr "&Fechar"
+msgstr "&Fe&char"
#: Merge.rc:170
#: Merge.rc:291
#: Merge.rc:479
#, c-format
msgid "Clo&se All"
-msgstr "Fechar &Todos"
+msgstr "Fechar &Tudo"
#: Merge.rc:172
#: Merge.rc:293
@@ -408,7 +409,7 @@
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&WinMerge Ajuda\tF1"
#: Merge.rc:182
#: Merge.rc:303
@@ -429,7 +430,7 @@
#: Merge.rc:493
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "&Configura\xE7\xF5es"
#: Merge.rc:185
#: Merge.rc:306
@@ -443,7 +444,7 @@
#: Merge.rc:496
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "GNU Licen\xE7a P\xFAblica Geral"
#: Merge.rc:188
#: Merge.rc:309
@@ -488,12 +489,12 @@
#: Merge.rc:220
#, c-format
msgid "Show L&eft Unique Items"
-msgstr "Mostrar itens \xFAnicos do lado esquerdo"
+msgstr "Mostrar apenas itens lado esquerdo"
#: Merge.rc:221
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr "Mostrar itens \xFAnicos do lado direito"
+msgstr "Mostrar apenas itens lado direito"
#: Merge.rc:222
#, c-format
@@ -513,17 +514,17 @@
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Modo \xC1rvore"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "E&xpandir todas as subpastas"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Fechar todas as subpastas"
#: Merge.rc:242
#, c-format
@@ -586,13 +587,13 @@
#: Merge.rc:440
#, c-format
msgid "Copy to &Right\tAlt+Right"
-msgstr "Copiar para o lado direito\tAlt+Right"
+msgstr "Copiar para a direita\tAlt+Right"
#: Merge.rc:261
#: Merge.rc:441
#, c-format
msgid "Copy to L&eft\tAlt+Left"
-msgstr "Copiar para o lado esquerdo\tAlt+Left"
+msgstr "Copiar para a esquerda\tAlt+Left"
#: Merge.rc:263
#, c-format
@@ -619,7 +620,7 @@
#: Merge.rc:325
#, c-format
msgid "Save &Left"
-msgstr "Guardar lado esquerdo"
+msgstr "Guardar da Esquerda"
#: Merge.rc:327
#: Merge.rc:332
@@ -636,7 +637,7 @@
#: Merge.rc:330
#, c-format
msgid "Save &Right"
-msgstr "Guardar lado direito"
+msgstr "Guardar da Direita"
#: Merge.rc:336
#, c-format
@@ -646,7 +647,7 @@
#: Merge.rc:337
#, c-format
msgid "Page Se&tup"
-msgstr ""
+msgstr "Con&figura\xE7\xF5es da p\xE1gina"
#: Merge.rc:338
#, c-format
@@ -681,7 +682,7 @@
#: Merge.rc:352
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "Codificar ficheiro..."
#: Merge.rc:358
#, c-format
@@ -696,7 +697,7 @@
#: Merge.rc:361
#, c-format
msgid "Cu&t\tCtrl+X"
-msgstr ""
+msgstr "Co&rtar\tCtrl+X"
#: Merge.rc:362
#, c-format
@@ -777,23 +778,23 @@
#: Merge.rc:396
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "&Zoom"
#: Merge.rc:398
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Zoom &Ampliar\tCtrl++"
#: Merge.rc:399
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Zoom &Reduzir\tCtrl+-"
#. Zoom to normal
#: Merge.rc:400
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "&Normal\tCtrl+*"
#: Merge.rc:402
#, c-format
@@ -803,7 +804,7 @@
#: Merge.rc:407
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "Trancar janelas"
#: Merge.rc:408
#, c-format
@@ -823,7 +824,7 @@
#: Merge.rc:411
#, c-format
msgid "View &Margins"
-msgstr ""
+msgstr "Ver &Margens"
#: Merge.rc:412
#, c-format
@@ -848,22 +849,22 @@
#: Merge.rc:443
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "C&opiar para a direita e avan\xE7ar\tAlt+Ctrl+Right"
+msgstr "C&opiar para a Direita e Avan\xE7ar\tAlt+Ctrl+Right"
#: Merge.rc:444
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Copiar para o lado esquerdo\tAlt+Ctrl+Left"
+msgstr "Copiar ¶ a Esquerda e Avan\xE7ar\tAlt+Ctrl+Left"
#: Merge.rc:446
#, c-format
msgid "Copy &All to Right"
-msgstr "Copiar tudo para a direita"
+msgstr "Copiar Tudo para a Direita"
#: Merge.rc:447
#, c-format
msgid "Cop&y All to Left"
-msgstr "C&opiar tudo para a esquerda"
+msgstr "C&opiar Tudo para a Esquerda"
#: Merge.rc:464
#, c-format
@@ -878,7 +879,7 @@
#: Merge.rc:506
#, c-format
msgid "Co&mpare As"
-msgstr ""
+msgstr "Co&mparar como"
#: Merge.rc:508
#, c-format
@@ -888,7 +889,7 @@
#: Merge.rc:509
#, c-format
msgid "&Binary"
-msgstr ""
+msgstr "&Bin\xE1rio"
#: Merge.rc:514
#, c-format
@@ -962,12 +963,12 @@
#: Merge.rc:533
#, c-format
msgid "&Open Left"
-msgstr "Abrir esquerda"
+msgstr "Abrir Esquerda"
#: Merge.rc:539
#, c-format
msgid "O&pen Right"
-msgstr "Abrir direita"
+msgstr "Abrir Direita"
#: Merge.rc:546
#, c-format
@@ -1032,7 +1033,7 @@
#: Merge.rc:575
#, c-format
msgid "Copy &Filename"
-msgstr "Co&piar nome de ficheiro"
+msgstr "Co&piar nome do ficheiro"
#: Merge.rc:581
#, c-format
@@ -1067,7 +1068,7 @@
#: Merge.rc:597
#, c-format
msgid "Moved Block for &Current Diff"
-msgstr "Bloco movido para a diferen\xE7a actual"
+msgstr "Bloco movido para a diferen\xE7a &actual"
#: Merge.rc:666
#, c-format
@@ -1077,7 +1078,7 @@
#: Merge.rc:672
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(Programa\xE7\xE3o privada)"
#: Merge.rc:673
#, c-format
@@ -1244,7 +1245,7 @@
#: Merge.rc:738
#, c-format
msgid "Check Out"
-msgstr ""
+msgstr "Sair"
#: Merge.rc:739
#: Merge.rc:875
@@ -1303,17 +1304,17 @@
#: Merge.rc:773
#, c-format
msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "Pe&rguntar ao fechar m\xFAltiplas janelas"
#: Merge.rc:775
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "&Preservar o tempo do ficheiro na compara\xE7\xE3o de ficheiros"
#: Merge.rc:778
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Mostrar notifica\xE7\xE3o de \"Pastas ou ficheiros seleccionados\" No inicio"
#: Merge.rc:780
#, c-format
@@ -1461,7 +1462,7 @@
#: Merge.rc:873
#, c-format
msgid "CheckOut"
-msgstr ""
+msgstr "Sair"
#: Merge.rc:878
#: Merge.rc:1170
@@ -1492,17 +1493,17 @@
#: Merge.rc:898
#, c-format
msgid "New"
-msgstr ""
+msgstr "Novo"
#: Merge.rc:899
#, c-format
msgid "Edit"
-msgstr ""
+msgstr "Editar"
#: Merge.rc:900
#, c-format
msgid "Remove"
-msgstr ""
+msgstr "Remover"
#: Merge.rc:905
#: Merge.rc:1954
@@ -1600,27 +1601,27 @@
#: Merge.rc:1005
#, c-format
msgid "&Filter folder:"
-msgstr "Arquivo do filtro:"
+msgstr "Filtro de arquivo:"
#: Merge.rc:1007
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "P&esquisar..."
#: Merge.rc:1008
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "Pasta de ficheiros tempor\xE1rios"
#: Merge.rc:1009
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "Pasta de ficheiros de s&istema"
#: Merge.rc:1011
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "Pasta p&ersonalizada"
#: Merge.rc:1014
#: Merge.rc:1030
@@ -1691,7 +1692,7 @@
#: Merge.rc:1050
#, c-format
msgid "Ig&nore all"
-msgstr "Ignorar todos"
+msgstr "Ignorar todas"
#: Merge.rc:1052
#, c-format
@@ -1721,12 +1722,12 @@
#: Merge.rc:1086
#, c-format
msgid "Move &Up"
-msgstr ""
+msgstr "Mover para &cima"
#: Merge.rc:1087
#, c-format
msgid "Move &Down"
-msgstr ""
+msgstr "Mover para &baixo"
#: Merge.rc:1097
#, c-format
@@ -1853,7 +1854,7 @@
#: Merge.rc:1166
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Igno&rar diferentes tipos de ficheiros (Windows/Unix/Mac)"
#: Merge.rc:1168
#, c-format
@@ -1863,7 +1864,7 @@
#: Merge.rc:1169
#, c-format
msgid "&Match similar lines"
-msgstr ""
+msgstr "Combinar linhas semelhantes"
#: Merge.rc:1171
#, c-format
@@ -1874,7 +1875,7 @@
#: Merge.rc:1953
#, c-format
msgid "Editor"
-msgstr ""
+msgstr "Editor"
#: Merge.rc:1180
#, c-format
@@ -1899,7 +1900,7 @@
#: Merge.rc:1187
#, c-format
msgid "&Tab size:"
-msgstr "Tamanho de tabs:"
+msgstr "Tamanho da tabula\xE7\xE3o:"
#: Merge.rc:1190
#, c-format
@@ -1914,7 +1915,7 @@
#: Merge.rc:1194
#, c-format
msgid "Line Difference Coloring"
-msgstr "Cores de diferen\xE7a de linha"
+msgstr "Cores da diferen\xE7a de linha"
#: Merge.rc:1196
#, c-format
@@ -1934,7 +1935,7 @@
#: Merge.rc:1204
#, c-format
msgid "W&ord break characters:"
-msgstr ""
+msgstr "Caracteres da palavra:"
#: Merge.rc:1217
#, c-format
@@ -1974,7 +1975,7 @@
#: Merge.rc:1236
#, c-format
msgid "Left side file"
-msgstr "Ficheiro do lado esquerdo"
+msgstr "Ficheiro lado esquerdo"
#: Merge.rc:1239
#, c-format
@@ -1989,7 +1990,7 @@
#: Merge.rc:1243
#, c-format
msgid "Right side file"
-msgstr "Ficheiro do lado direito"
+msgstr "Ficheiro lado direito"
#: Merge.rc:1246
#, c-format
@@ -2004,7 +2005,7 @@
#: Merge.rc:1250
#, c-format
msgid "Disca&rd All"
-msgstr ""
+msgstr "Rejei&tar todas"
#: Merge.rc:1257
#: Merge.rc:1505
@@ -2353,7 +2354,7 @@
#: Merge.rc:1494
#, c-format
msgid "Total:"
-msgstr ""
+msgstr "Total"
#: Merge.rc:1499
#, c-format
@@ -2497,32 +2498,32 @@
#: Merge.rc:1961
#, c-format
msgid "Backup Files"
-msgstr ""
+msgstr "Fazer c\xF3pia de Ficheiros"
#: Merge.rc:1608
#, c-format
msgid "Create backup files in:"
-msgstr ""
+msgstr "Criar c\xF3pia de ficheiros em:"
#: Merge.rc:1613
#, c-format
msgid "Create backup files into:"
-msgstr ""
+msgstr "Criar c\xF3pia de ficheiros para:"
#: Merge.rc:1614
#, c-format
msgid "&Original file's folder"
-msgstr ""
+msgstr "Pasta de arquivos originais"
#: Merge.rc:1616
#, c-format
msgid "&Global backup folder:"
-msgstr ""
+msgstr "C\xF3pia geral de arquivos:"
#: Merge.rc:1620
#, c-format
msgid "Backup filename:"
-msgstr ""
+msgstr "Nome da c\xF3pia do ficheiro"
#: Merge.rc:1621
#, c-format
@@ -2538,7 +2539,7 @@
#: Merge.rc:2256
#, c-format
msgid "Confirm Copy"
-msgstr ""
+msgstr "Confirmar c\xF3pia"
#: Merge.rc:1634
#, c-format
@@ -2548,22 +2549,22 @@
#: Merge.rc:1636
#, c-format
msgid "From left"
-msgstr ""
+msgstr "Da esquerda"
#: Merge.rc:1639
#, c-format
msgid "To right"
-msgstr ""
+msgstr "Para a direita"
#: Merge.rc:1642
#, c-format
msgid "Yes"
-msgstr ""
+msgstr "Sim"
#: Merge.rc:1643
#, c-format
msgid "No"
-msgstr ""
+msgstr "N\xE3o"
#: Merge.rc:1649
#, c-format
@@ -2584,7 +2585,7 @@
#: Merge.rc:1666
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Pesquisar"
#: Merge.rc:1667
#, c-format
@@ -2621,7 +2622,7 @@
#: Merge.rc:1684
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "&M\xE9todo de compara\xE7\xE3o"
#: Merge.rc:1686
#, c-format
@@ -3090,27 +3091,27 @@
#: Merge.rc:1972
#, c-format
msgid "To:"
-msgstr ""
+msgstr "Para"
#: Merge.rc:1973
#, c-format
msgid "From left:"
-msgstr ""
+msgstr "Da esquerda"
#: Merge.rc:1974
#, c-format
msgid "To left:"
-msgstr ""
+msgstr "Para a esquerda"
#: Merge.rc:1975
#, c-format
msgid "From right:"
-msgstr ""
+msgstr "Da direita"
#: Merge.rc:1976
#, c-format
msgid "To right:"
-msgstr ""
+msgstr "Para a direita"
#: Merge.rc:1982
#, c-format
@@ -3165,7 +3166,7 @@
#: Merge.rc:2004
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Ficheiros (*.*)|*.*||"
#: Merge.rc:2005
#, c-format
@@ -3220,7 +3221,7 @@
#: Merge.rc:2031
#, c-format
msgid "Full Contents"
-msgstr ""
+msgstr "Conte\xFAdo completo"
#: Merge.rc:2032
#, c-format
@@ -3297,7 +3298,7 @@
#: Merge.rc:2055
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
-msgstr ""
+msgstr "Erro ao eliminar o filtro do ficheiro:\n%1\n\nTalvez o ficheiro seja s\xF3 de leitura?"
#: Merge.rc:2056
#, c-format
@@ -3307,12 +3308,12 @@
#: Merge.rc:2058
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
-msgstr ""
+msgstr "A instala\xE7\xE3o do filtro de ficheiro falhou.\n\nN\xE3o foi poss\xEDvel copiar o novo filtro de ficheiro para a pasta de filtros."
#: Merge.rc:2060
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
-msgstr ""
+msgstr "O filtro de ficheiro j\xE1 existe. Subst\xEDtuir filtro existente?"
#: Merge.rc:2066
#, c-format
@@ -3458,7 +3459,7 @@
#: Merge.rc:2120
#, c-format
msgid "RO"
-msgstr ""
+msgstr "AL"
#: Merge.rc:2126
#, c-format
@@ -3563,7 +3564,7 @@
#: Merge.rc:2162
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
-msgstr ""
+msgstr "N\xE3o foi poss\xEDvel copiar ficheiro original:\n%1\n\nContinuar na mesma?"
#: Merge.rc:2163
#, c-format
@@ -3736,12 +3737,12 @@
#: Merge.rc:2219
#, c-format
msgid "Right to Left (%1 of %2)"
-msgstr "Da direita para a esquerda (%1 de %2)"
+msgstr "Direita para a Esquerda (%1 de %2)"
#: Merge.rc:2220
#, c-format
msgid "Left to Right (%1 of %2)"
-msgstr "Da esquerda para a direita (%1 de %2)"
+msgstr "Esquerda para a Direita (%1 de %2)"
#: Merge.rc:2221
#: Merge.rc:2237
@@ -3759,13 +3760,13 @@
#: Merge.rc:2239
#, c-format
msgid "Left to... (%1 of %2)"
-msgstr "Da esquerda para... (%1 de %2)"
+msgstr "Esquerda para... (%1 de %2)"
#: Merge.rc:2224
#: Merge.rc:2240
#, c-format
msgid "Right to... (%1 of %2)"
-msgstr "Da direita para... (%1 de %2)"
+msgstr "Da Direita para... (%1 de %2)"
#: Merge.rc:2230
#, c-format
@@ -3920,12 +3921,12 @@
#: Merge.rc:2280
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Menu Shell da esquerda"
#: Merge.rc:2281
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Menu Shell da direita"
#: Merge.rc:2287
#, c-format
@@ -4101,12 +4102,12 @@
#: Merge.rc:2345
#, c-format
msgid "Left only: %1"
-msgstr ""
+msgstr "Apenas da esquerda"
#: Merge.rc:2346
#, c-format
msgid "Right only: %1"
-msgstr ""
+msgstr "Apenas da direita"
#: Merge.rc:2347
#, c-format
@@ -4356,7 +4357,7 @@
#: Merge.rc:2433
#, c-format
msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: 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 ""
+msgstr "Estes ficheiros utilizam diferentes tipos de procedimento. \n\nDeseja tratar todos os tipos de procedimento por igual para compara\xE7\xE3o?\n\nNota: 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)."
#: Merge.rc:2434
#, c-format
@@ -4381,12 +4382,12 @@
#: Merge.rc:2438
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr ""
+msgstr "A pasta existe apenas no outro lado e n\xE3o pode ser aberta. \n\nPretende criar a pasta correspondente:\n%1\npara o outro lado e abrir essas pastas?"
#: Merge.rc:2444
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
-msgstr "Encontrados p\xE1ginas de c\xF3digo diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d). \nApresentar cada ficheiro na sua p\xE1gina de c\xF3digo ter\xE1 melhor visualiza\xE7\xE3o, mas combinar/copiar poder\xE1 ser arriscado.\Deseja tratar os dois ficheiros como tendo as p\xE1ginas de c\xF3digo predefinidas para as janelas?"
+msgstr "Encontradas p\xE1ginas de c\xF3digo diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d). \nApresentar cada ficheiro na sua p\xE1gina de c\xF3digo ter\xE1 melhor visualiza\xE7\xE3o, mas combinar/copiar poder\xE1 ser arriscado.\Deseja tratar os dois ficheiros como tendo as p\xE1ginas de c\xF3digo predefinidas para as janelas?"
#: Merge.rc:2445
#, c-format
@@ -4426,7 +4427,7 @@
#: Merge.rc:2462
#, c-format
msgid "Cannot find string \"%s\""
-msgstr "Impos\xEDvel localizar string \"%s\""
+msgstr "Imposs\xEDvel localizar string \"%s\""
#: Merge.rc:2468
#, c-format
@@ -4476,7 +4477,7 @@
#: Merge.rc:2487
#, c-format
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: Merge.rc:2488
#, c-format
@@ -4516,7 +4517,7 @@
#: Merge.rc:2495
#, c-format
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
-msgstr "Por favor, guarde todos os ficheiros antes.\n\nCiar um ficheiro patch requer a inexist\xEAncia de altera\xE7\xF5es por guardar nos ficheiros."
+msgstr "Por favor, guarde todos os ficheiros primeiro.\n\nCriar um ficheiro patch requer a inexist\xEAncia de altera\xE7\xF5es por guardar nos ficheiros."
#: Merge.rc:2496
#, c-format
@@ -4531,7 +4532,7 @@
#: Merge.rc:2502
#, c-format
msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
-msgstr ""
+msgstr "O arquivo de suporte n\xE3o est\xE1 activado. \nN\xE3o foram encontrados todos os componentes necess\xE1rios (7-zip and/or Merge7z*.dll) \nPara mais informa\xE7\xF5es verifique o manual acerca do arquivo de suporte e active-o."
#: Merge.rc:2503
#, c-format
@@ -4576,7 +4577,7 @@
#: Merge.rc:2511
#, c-format
msgid "You are about to close several compare windows.\n\nDo you want to continue?"
-msgstr ""
+msgstr "Est\xE1 prestes a fechar m\xFAltiplas janelas de compara\xE7\xE3o. \n\nDeseja continuar?"
#: Merge.rc:2517
#, c-format
@@ -4731,12 +4732,12 @@
#: Merge.rc:2568
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Tipo"
#: Merge.rc:2570
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "Descompactador"
#: Merge.rc:2571
#, c-format
@@ -4746,7 +4747,7 @@
#: Merge.rc:2572
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Editor script"
#: Merge.rc:2579
#, c-format
@@ -5221,7 +5222,7 @@
#: Merge.rc:2739
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Sem destaque"
#: Merge.rc:2740
#, c-format
@@ -5236,7 +5237,7 @@
#: Merge.rc:2742
#, c-format
msgid "Batch"
-msgstr ""
+msgstr "Quantidade"
#: Merge.rc:2743
#, c-format
@@ -5316,7 +5317,7 @@
#: Merge.rc:2758
#, c-format
msgid "Portable Object"
-msgstr ""
+msgstr "Objecto Port\xE1til"
#: Merge.rc:2759
#, c-format
@@ -5336,7 +5337,7 @@
#: Merge.rc:2762
#, c-format
msgid "Resources"
-msgstr ""
+msgstr "Recursos"
#: Merge.rc:2763
#, c-format
@@ -5351,7 +5352,7 @@
#: Merge.rc:2765
#, c-format
msgid "Shell"
-msgstr ""
+msgstr "Shell"
#: Merge.rc:2766
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-31 22:28:57
|
Revision: 7618
http://sourceforge.net/p/winmerge/code/7618
Author: christianlist
Date: 2013-03-31 22:28:55 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
[patches:#3030] Unquoted program path vulnerability in installer integration with subversion
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2013-03-31 22:22:58 UTC (rev 7617)
+++ trunk/Docs/Users/ChangeLog.txt 2013-03-31 22:28:55 UTC (rev 7618)
@@ -23,6 +23,7 @@
Bugfix: WinMerge contained a vulnerability in handling project files (#3185386)
(http://www.zeroscience.mk/mk/vulnerabilities/ZSL-2011-4997.php)
Bugfix: Shell extension uses unquoted program path (patches:#3023)
+ Bugfix: Unquoted program path vulnerability in installer integration with subversion (patches:#3030)
Bugfix: Download link to the 7-zip plugin installer is broken (bugs:#2128)
New translations:
- Basque (#3387142, patches:#3024)
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2013-03-31 22:22:58 UTC (rev 7617)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2013-03-31 22:28:55 UTC (rev 7618)
@@ -552,10 +552,10 @@
Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
;Set WinMerge as TortoiseGit diff tool
-Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseGit
+Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Diff; ValueData: """{app}\{code:ExeName}"" -e -u -dl %bname -dr %yname %base %mine"; Flags: uninsdeletevalue; Tasks: TortoiseGit
;Set WinMerge as TortoiseSVN diff tool
-Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: """{app}\{code:ExeName}"" -e -u -dl %bname -dr %yname %base %mine"; Flags: uninsdeletevalue; Tasks: TortoiseSVN
;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
;(unless the user already has a startup language specified)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-31 22:23:01
|
Revision: 7617
http://sourceforge.net/p/winmerge/code/7617
Author: christianlist
Date: 2013-03-31 22:22:58 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
[patches:#3030] Unquoted program path vulnerability in installer integration with subversion
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Installer/InnoSetup/WinMerge.iss
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-28 20:41:42 UTC (rev 7616)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-31 22:22:58 UTC (rev 7617)
@@ -5,6 +5,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.14.2
+ Bugfix: Unquoted program path vulnerability in installer integration with subversion (patches:#3030)
Bugfix: Download link to the 7-zip plugin installer is broken (bugs:#2128)
Translation updates:
- Basque (patches:#3024)
Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2013-03-28 20:41:42 UTC (rev 7616)
+++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2013-03-31 22:22:58 UTC (rev 7617)
@@ -553,7 +553,7 @@
Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
;Set WinMerge as TortoiseSVN diff tool
-Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: """{app}\{code:ExeName}"" -e -u -dl %bname -dr %yname %base %mine"; Flags: uninsdeletevalue; Tasks: TortoiseSVN
;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
;(unless the user already has a startup language specified)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2013-03-28 20:41:46
|
Revision: 7616
http://sourceforge.net/p/winmerge/code/7616
Author: gerundt
Date: 2013-03-28 20:41:42 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
Replace BOOL with bool
Modified Paths:
--------------
trunk/Src/editlib/asp.cpp
trunk/Src/editlib/basic.cpp
trunk/Src/editlib/batch.cpp
trunk/Src/editlib/cplusplus.cpp
trunk/Src/editlib/csharp.cpp
trunk/Src/editlib/css.cpp
trunk/Src/editlib/dcl.cpp
trunk/Src/editlib/fortran.cpp
trunk/Src/editlib/html.cpp
trunk/Src/editlib/ini.cpp
trunk/Src/editlib/innosetup.cpp
trunk/Src/editlib/is.cpp
trunk/Src/editlib/java.cpp
trunk/Src/editlib/lisp.cpp
trunk/Src/editlib/nsis.cpp
trunk/Src/editlib/pascal.cpp
trunk/Src/editlib/perl.cpp
trunk/Src/editlib/php.cpp
trunk/Src/editlib/po.cpp
trunk/Src/editlib/powershell.cpp
trunk/Src/editlib/python.cpp
trunk/Src/editlib/rexx.cpp
trunk/Src/editlib/rsrc.cpp
trunk/Src/editlib/ruby.cpp
trunk/Src/editlib/sgml.cpp
trunk/Src/editlib/sh.cpp
trunk/Src/editlib/siod.cpp
trunk/Src/editlib/sql.cpp
trunk/Src/editlib/tcl.cpp
trunk/Src/editlib/tex.cpp
trunk/Src/editlib/verilog.cpp
trunk/Src/editlib/xml.cpp
Modified: trunk/Src/editlib/asp.cpp
===================================================================
--- trunk/Src/editlib/asp.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/asp.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -533,43 +533,43 @@
NULL
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsHtmlKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszHtmlKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser1Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser2Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsAspKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszAspKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsAspNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -579,20 +579,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -622,9 +622,9 @@
return dwCookie & (COOKIE_EXT_COMMENT|COOKIE_EXT_USER1);
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_USER1)) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_USER1)) == 0;
+ bool bRedefineBlock = true;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -667,13 +667,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -695,7 +695,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -706,7 +706,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -719,7 +719,7 @@
if (I > 1 && pszChars[I] == '>' && pszChars[nPrevI] == '-' && *::CharPrev(pszChars, pszChars + nPrevI) == '-')
{
dwCookie &= ~COOKIE_EXT_COMMENT;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
}
continue;
@@ -738,7 +738,7 @@
if (I > 0 && pszChars[I] == '>' && (pszChars[nPrevI] == '?' || pszChars[nPrevI] == '%'))
{
dwCookie &= ~COOKIE_EXT_USER1;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
continue;
}
}
@@ -777,7 +777,7 @@
if (bFirstChar)
{
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
// User1 start: <?
@@ -833,7 +833,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -841,7 +841,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -867,8 +867,8 @@
goto next;
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
next:
;
@@ -891,8 +891,8 @@
{
dwCookie &= ~COOKIE_EXT_USER1;
nIdentBegin = -1;
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
continue;
}
}
@@ -904,8 +904,8 @@
{
dwCookie &= ~COOKIE_PREPROCESSOR;
nIdentBegin = -1;
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
continue;
}
}
@@ -952,7 +952,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -960,7 +960,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -983,7 +983,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -991,7 +991,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
Modified: trunk/Src/editlib/basic.cpp
===================================================================
--- trunk/Src/editlib/basic.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/basic.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -311,25 +311,25 @@
NULL
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsBasicKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszBasicKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsBasicNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -339,20 +339,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -380,9 +380,9 @@
return dwCookie & COOKIE_EXT_COMMENT;
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ bool bRedefineBlock = true;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -417,13 +417,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -445,7 +445,7 @@
if (pszChars[I] == '"')
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -468,7 +468,7 @@
if (bFirstChar)
{
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -494,7 +494,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -502,7 +502,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -512,8 +512,8 @@
DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
}
}
@@ -531,7 +531,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -539,7 +539,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
Modified: trunk/Src/editlib/batch.cpp
===================================================================
--- trunk/Src/editlib/batch.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/batch.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -649,19 +649,19 @@
NULL
};
-static BOOL
+static bool
IsBatKeyword (LPCTSTR pszChars, int nLength)
{
for (int L = 0; s_apszBatKeywordList[L] != NULL; L++)
{
if (_tcsnicmp (s_apszBatKeywordList[L], pszChars, nLength) == 0
&& s_apszBatKeywordList[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsUser1Keyword (LPCTSTR pszChars, int nLength)
{
TCHAR buffer[13];
@@ -670,40 +670,40 @@
{
if (_tcsnicmp (s_apszUser1KeywordList[L], pszChars, nLength) == 0
&& s_apszUser1KeywordList[L][nLength] == 0)
- return TRUE;
+ return true;
_tcscpy (buffer, s_apszUser1KeywordList[L]);
_tcscat (buffer, _T (".COM"));
if (_tcsnicmp (buffer, pszChars, nLength) == 0
&& buffer[nLength] == 0)
- return TRUE;
+ return true;
_tcscpy (buffer, s_apszUser1KeywordList[L]);
_tcscat (buffer, _T (".EXE"));
if (_tcsnicmp (buffer, pszChars, nLength) == 0
&& buffer[nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsUser2Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsBatNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -713,20 +713,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -754,9 +754,9 @@
return dwCookie & COOKIE_EXT_COMMENT;
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ bool bRedefineBlock = true;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -795,13 +795,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -823,7 +823,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -834,7 +834,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -900,7 +900,7 @@
continue;
}
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -949,8 +949,8 @@
DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
}
}
Modified: trunk/Src/editlib/cplusplus.cpp
===================================================================
--- trunk/Src/editlib/cplusplus.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/cplusplus.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -223,31 +223,31 @@
NULL
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsncmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsCppKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszCppKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser1Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsCppNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -257,20 +257,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -298,10 +298,10 @@
return dwCookie & COOKIE_EXT_COMMENT;
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bWasCommentStart = FALSE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ bool bRedefineBlock = true;
+ bool bWasCommentStart = false;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -340,13 +340,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -368,7 +368,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -379,7 +379,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -391,9 +391,9 @@
if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' /*&& *::CharPrev(pszChars, pszChars + nPrevI) != '/'*/ && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*'))
{
dwCookie &= ~COOKIE_EXT_COMMENT;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
- bWasCommentStart = FALSE;
+ bWasCommentStart = false;
continue;
}
@@ -436,11 +436,11 @@
{
DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT);
dwCookie |= COOKIE_EXT_COMMENT;
- bWasCommentStart = TRUE;
+ bWasCommentStart = true;
continue;
}
- bWasCommentStart = FALSE;
+ bWasCommentStart = false;
if (bFirstChar)
{
@@ -451,7 +451,7 @@
continue;
}
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -481,7 +481,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -489,7 +489,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -499,8 +499,8 @@
DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
}
}
@@ -522,7 +522,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -530,7 +530,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
Modified: trunk/Src/editlib/csharp.cpp
===================================================================
--- trunk/Src/editlib/csharp.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/csharp.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -120,25 +120,25 @@
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsncmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsCppKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszCppKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsCppNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -148,20 +148,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -189,10 +189,10 @@
return dwCookie & COOKIE_EXT_COMMENT;
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bWasCommentStart = FALSE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ bool bRedefineBlock = true;
+ bool bWasCommentStart = false;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -231,13 +231,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -259,7 +259,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -270,7 +270,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -282,9 +282,9 @@
if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' /*&& *::CharPrev(pszChars, pszChars + nPrevI) != '/'*/ && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*'))
{
dwCookie &= ~COOKIE_EXT_COMMENT;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
- bWasCommentStart = FALSE;
+ bWasCommentStart = false;
continue;
}
@@ -327,11 +327,11 @@
{
DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT);
dwCookie |= COOKIE_EXT_COMMENT;
- bWasCommentStart = TRUE;
+ bWasCommentStart = true;
continue;
}
- bWasCommentStart = FALSE;
+ bWasCommentStart = false;
if (bFirstChar)
{
@@ -342,7 +342,7 @@
continue;
}
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -368,7 +368,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -376,7 +376,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -386,8 +386,8 @@
DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
}
}
@@ -405,7 +405,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -413,7 +413,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
Modified: trunk/Src/editlib/css.cpp
===================================================================
--- trunk/Src/editlib/css.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/css.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -180,25 +180,25 @@
NULL
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsCss1Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszCss1KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsCss2Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszCss2KeywordList, pszChars, nLength);
@@ -231,10 +231,10 @@
return dwCookie & (COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE);
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE)) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bWasCommentStart = FALSE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE)) == 0;
+ bool bRedefineBlock = true;
+ bool bWasCommentStart = false;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -272,13 +272,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -311,9 +311,9 @@
if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*'))
{
dwCookie &= ~COOKIE_EXT_COMMENT;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
- bWasCommentStart = FALSE;
+ bWasCommentStart = false;
continue;
}
@@ -326,16 +326,16 @@
{
DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT);
dwCookie |= COOKIE_EXT_COMMENT;
- bWasCommentStart = TRUE;
+ bWasCommentStart = true;
continue;
}
- bWasCommentStart = FALSE;
+ bWasCommentStart = false;
if (bFirstChar)
{
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -366,8 +366,8 @@
goto next;
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
next:
;
Modified: trunk/Src/editlib/dcl.cpp
===================================================================
--- trunk/Src/editlib/dcl.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/dcl.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -110,37 +110,37 @@
NULL
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsncmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsDclKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszDclKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser1Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser2Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsDclNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -150,20 +150,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -191,10 +191,10 @@
return dwCookie & COOKIE_EXT_COMMENT;
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bWasCommentStart = FALSE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ bool bRedefineBlock = true;
+ bool bWasCommentStart = false;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -229,13 +229,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -257,7 +257,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -268,7 +268,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -280,9 +280,9 @@
if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' /*&& *::CharPrev(pszChars, pszChars + nPrevI) != '/'*/ && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*'))
{
dwCookie &= ~COOKIE_EXT_COMMENT;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
- bWasCommentStart = FALSE;
+ bWasCommentStart = false;
continue;
}
@@ -314,16 +314,16 @@
{
DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT);
dwCookie |= COOKIE_EXT_COMMENT;
- bWasCommentStart = TRUE;
+ bWasCommentStart = true;
continue;
}
- bWasCommentStart = FALSE;
+ bWasCommentStart = false;
if (bFirstChar)
{
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -357,7 +357,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -365,7 +365,7 @@
{
if (pszChars[j] == '{' || pszChars[j] == ':')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -378,7 +378,7 @@
{
if (pszChars[j] == ':')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -389,8 +389,8 @@
DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
}
}
@@ -416,7 +416,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -424,7 +424,7 @@
{
if (pszChars[j] == '{' || pszChars[j] == ':')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -437,7 +437,7 @@
{
if (pszChars[j] == ':')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
Modified: trunk/Src/editlib/fortran.cpp
===================================================================
--- trunk/Src/editlib/fortran.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/fortran.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -237,25 +237,25 @@
NULL
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsFortranKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszFortranKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsFortranNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -265,20 +265,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -306,9 +306,9 @@
return dwCookie & COOKIE_EXT_COMMENT;
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ bool bRedefineBlock = true;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -343,13 +343,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -371,7 +371,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -382,7 +382,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -415,7 +415,7 @@
if (bFirstChar)
{
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -439,8 +439,8 @@
{
DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
}
}
Modified: trunk/Src/editlib/html.cpp
===================================================================
--- trunk/Src/editlib/html.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/html.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -369,37 +369,37 @@
NULL
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsHtmlKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszHtmlKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser1Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser2Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsHtmlNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -409,20 +409,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -452,9 +452,9 @@
return dwCookie & (COOKIE_EXT_COMMENT|COOKIE_EXT_USER1);
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_USER1)) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_USER1)) == 0;
+ bool bRedefineBlock = true;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -497,13 +497,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -525,7 +525,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -536,7 +536,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -547,7 +547,7 @@
if (I > 1 && pszChars[I] == '>' && pszChars[nPrevI] == '-' && *::CharPrev(pszChars, pszChars + nPrevI) == '-')
{
dwCookie &= ~COOKIE_EXT_COMMENT;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -558,7 +558,7 @@
if (I > 0 && pszChars[I] == '>' && (pszChars[nPrevI] == '?' || pszChars[nPrevI] == '%'))
{
dwCookie &= ~COOKIE_EXT_USER1;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -594,7 +594,7 @@
if (bFirstChar)
{
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -640,8 +640,8 @@
goto next;
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
next:
;
@@ -673,8 +673,8 @@
{
dwCookie &= ~COOKIE_EXT_USER1;
nIdentBegin = -1;
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
continue;
}
}
@@ -686,8 +686,8 @@
{
dwCookie &= ~COOKIE_PREPROCESSOR;
nIdentBegin = -1;
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
continue;
}
}
@@ -733,7 +733,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -741,7 +741,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
Modified: trunk/Src/editlib/ini.cpp
===================================================================
--- trunk/Src/editlib/ini.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/ini.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -27,7 +27,7 @@
static char THIS_FILE[] = __FILE__;
#endif
-static BOOL
+static bool
IsIniNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -37,20 +37,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -80,9 +80,9 @@
return dwCookie & COOKIE_EXT_COMMENT;
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ bool bRedefineBlock = true;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -125,13 +125,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -153,7 +153,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -164,7 +164,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -175,7 +175,7 @@
if (pszChars[I] == ']')
{
dwCookie &= ~COOKIE_SECTION;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -186,7 +186,7 @@
if (I + 1 < nLength && pszChars[I + 1] == '=')
{
dwCookie &= ~COOKIE_KEY;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -229,7 +229,7 @@
dwCookie |= COOKIE_KEY;
}
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -249,8 +249,8 @@
{
DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
}
}
Modified: trunk/Src/editlib/innosetup.cpp
===================================================================
--- trunk/Src/editlib/innosetup.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/innosetup.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -318,31 +318,31 @@
NULL
};
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsInnoSetupKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszInnoSetupKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser1Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsInnoSetupNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -352,20 +352,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- return FALSE;
+ return false;
for (int I = 1; I < nLength; I++)
{
if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
pszChars[I] != 'E')
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
#define DEFINE_BLOCK(pos, colorindex) \
@@ -395,9 +395,9 @@
return dwCookie & (COOKIE_EXT_COMMENT | COOKIE_EXT_COMMENT2);
LPCTSTR pszChars = GetLineChars (nLineIndex);
- BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
- BOOL bRedefineBlock = TRUE;
- BOOL bDecIndex = FALSE;
+ bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ bool bRedefineBlock = true;
+ bool bDecIndex = false;
int nIdentBegin = -1;
int nPrevI = -1;
int I=0;
@@ -440,13 +440,13 @@
else
{
DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
goto out;
}
}
- bRedefineBlock = FALSE;
- bDecIndex = FALSE;
+ bRedefineBlock = false;
+ bDecIndex = false;
}
out:
@@ -468,7 +468,7 @@
if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -479,7 +479,7 @@
if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -491,7 +491,7 @@
if ((I > 1 && pszChars[I] == ')' && pszChars[nPrevI] == '*' && *::CharPrev(pszChars, pszChars + nPrevI) != '(') || (I == 1 && pszChars[I] == ')' && pszChars[nPrevI] == '*'))
{
dwCookie &= ~COOKIE_EXT_COMMENT;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -502,7 +502,7 @@
if (pszChars[I] == '}')
{
dwCookie &= ~COOKIE_EXT_COMMENT2;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -520,7 +520,7 @@
if (pszChars[I] == ']')
{
dwCookie &= ~COOKIE_SECTION;
- bRedefineBlock = TRUE;
+ bRedefineBlock = true;
}
continue;
}
@@ -577,7 +577,7 @@
continue;
}
if (!xisspace (pszChars[I]))
- bFirstChar = FALSE;
+ bFirstChar = false;
}
if (pBuf == NULL)
@@ -607,7 +607,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -615,7 +615,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
@@ -625,8 +625,8 @@
DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
}
}
- bRedefineBlock = TRUE;
- bDecIndex = TRUE;
+ bRedefineBlock = true;
+ bDecIndex = true;
nIdentBegin = -1;
}
}
@@ -648,7 +648,7 @@
}
else
{
- bool bFunction = FALSE;
+ bool bFunction = false;
for (int j = I; j < nLength; j++)
{
@@ -656,7 +656,7 @@
{
if (pszChars[j] == '(')
{
- bFunction = TRUE;
+ bFunction = true;
}
break;
}
Modified: trunk/Src/editlib/is.cpp
===================================================================
--- trunk/Src/editlib/is.cpp 2013-03-27 18:41:57 UTC (rev 7615)
+++ trunk/Src/editlib/is.cpp 2013-03-28 20:41:42 UTC (rev 7616)
@@ -417,37 +417,37 @@
_T ("XCopyFile"),
*/
-static BOOL
+static bool
IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
{
for (int L = 0; apszKeywords[L] != NULL; L++)
{
if (_tcsncmp (apszKeywords[L], pszChars, nLength) == 0
&& apszKeywords[L][nLength] == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static BOOL
+static bool
IsISKeyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszISKeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser1Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsUser2Keyword (LPCTSTR pszChars, int nLength)
{
return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength);
}
-static BOOL
+static bool
IsISNumber (LPCTSTR pszChars, int nLength)
{
if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
@@ -457,20 +457,20 @@
if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
(pszChars[I] >= 'a' && pszChars[I] <= 'f'))
continue;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if (!_istdigit (pszChars[0]))
- retur...
[truncated message content] |
|
From: <ge...@us...> - 2013-03-27 18:42:02
|
Revision: 7615
http://sourceforge.net/p/winmerge/code/7615
Author: gerundt
Date: 2013-03-27 18:41:57 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
Remove MFC dependency
Modified Paths:
--------------
trunk/Src/Common/PidlContainer.cpp
trunk/Src/DiffFileInfo.cpp
trunk/Src/Merge.vcproj
trunk/Src/MergeX64.vcproj
Modified: trunk/Src/Common/PidlContainer.cpp
===================================================================
--- trunk/Src/Common/PidlContainer.cpp 2013-03-24 10:06:01 UTC (rev 7614)
+++ trunk/Src/Common/PidlContainer.cpp 2013-03-27 18:41:57 UTC (rev 7615)
@@ -26,18 +26,11 @@
// Revision ID line follows -- this is updated by SVN
// $Id$
-#include "StdAfx.h"
#include "PidlContainer.h"
#include <ShlObj.h>
#include <comdef.h>
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
CPidlContainer::~CPidlContainer()
{
IMallocPtr m_pMalloc;
Modified: trunk/Src/DiffFileInfo.cpp
===================================================================
--- trunk/Src/DiffFileInfo.cpp 2013-03-24 10:06:01 UTC (rev 7614)
+++ trunk/Src/DiffFileInfo.cpp 2013-03-27 18:41:57 UTC (rev 7615)
@@ -22,11 +22,11 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "stdafx.h"
+#include <windows.h>
+#include <tchar.h>
+
#include "DirItem.h"
#include "DiffFileInfo.h"
-#include "unicoder.h"
-#include "UnicodeString.h"
/**
* @brief Convert file flags to string presentation.
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2013-03-24 10:06:01 UTC (rev 7614)
+++ trunk/Src/Merge.vcproj 2013-03-27 18:41:57 UTC (rev 7615)
@@ -819,6 +819,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -829,6 +830,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2765,6 +2767,29 @@
<File
RelativePath="Common\PidlContainer.cpp"
>
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="PluginManager.cpp"
Modified: trunk/Src/MergeX64.vcproj
===================================================================
--- trunk/Src/MergeX64.vcproj 2013-03-24 10:06:01 UTC (rev 7614)
+++ trunk/Src/MergeX64.vcproj 2013-03-27 18:41:57 UTC (rev 7615)
@@ -1460,6 +1460,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -1470,6 +1471,7 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -1480,6 +1482,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -1491,6 +1494,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
@@ -4898,6 +4902,52 @@
<File
RelativePath=".\Common\PidlContainer.cpp"
>
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeRelease|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="PluginManager.cpp"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2013-03-24 10:06:03
|
Revision: 7614
http://sourceforge.net/p/winmerge/code/7614
Author: gerundt
Date: 2013-03-24 10:06:01 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
Use FILEOP_FLAGS type at ShellFileOperations::SetOperation()
Modified Paths:
--------------
trunk/Src/Common/ShellFileOperations.cpp
trunk/Src/Common/ShellFileOperations.h
Modified: trunk/Src/Common/ShellFileOperations.cpp
===================================================================
--- trunk/Src/Common/ShellFileOperations.cpp 2013-03-17 19:47:32 UTC (rev 7613)
+++ trunk/Src/Common/ShellFileOperations.cpp 2013-03-24 10:06:01 UTC (rev 7614)
@@ -154,7 +154,7 @@
* @param [in] flags Flags related to the operation.
* @param [in] parentWindow Window getting notifications.
*/
-void ShellFileOperations::SetOperation(UINT operation, DWORD flags,
+void ShellFileOperations::SetOperation(UINT operation, FILEOP_FLAGS flags,
HWND parentWindow /*= NULL*/)
{
m_function = operation;
Modified: trunk/Src/Common/ShellFileOperations.h
===================================================================
--- trunk/Src/Common/ShellFileOperations.h 2013-03-17 19:47:32 UTC (rev 7613)
+++ trunk/Src/Common/ShellFileOperations.h 2013-03-24 10:06:01 UTC (rev 7614)
@@ -40,7 +40,7 @@
void AddSourceAndDestination(const String &source, const String &destination);
void AddSource(const String &source);
void SetDestination(const String &destination);
- void SetOperation(UINT operation, DWORD flags, HWND parentWindow = NULL);
+ void SetOperation(UINT operation, FILEOP_FLAGS flags, HWND parentWindow = NULL);
bool Run();
bool IsCanceled() const;
void Reset();
@@ -53,7 +53,7 @@
std::vector<String> m_sources; /**< Source paths. */
std::vector<String> m_destinations; /**< Destination paths. */
UINT m_function; /**< Operation used, copy, move, rename or delete. */
- DWORD m_flags; /**< Flags for the operation. */
+ FILEOP_FLAGS m_flags; /**< Flags for the operation. */
HWND m_parentWindow; /**< Parent window getting notifications. */
bool m_bOneToOneMapping; /**< Same amount of sources and destinations? */
bool m_isCanceled; /**< Did user cancel the operation? */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-17 19:47:36
|
Revision: 7613
http://sourceforge.net/p/winmerge/code/7613
Author: christianlist
Date: 2013-03-17 19:47:32 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
[patches:#2954] Set default language to System Language ID
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/OptionsInit.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2013-03-17 19:27:10 UTC (rev 7612)
+++ trunk/Docs/Users/ChangeLog.txt 2013-03-17 19:47:32 UTC (rev 7613)
@@ -7,6 +7,7 @@
WinMerge 2.15.1
Update version number in trunk
Drag and drop items from the folder compare (#3186717)
+ Set default language to System Language ID (patches:#2954)
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
Installer: Add support for TortoiseGit (patches:#3016)
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2013-03-17 19:27:10 UTC (rev 7612)
+++ trunk/Src/OptionsInit.cpp 2013-03-17 19:47:32 UTC (rev 7613)
@@ -36,8 +36,8 @@
m_pOptions->SetRegRootKey(_T("Thingamahoochie\\WinMerge\\"));
- // Default language to English unless installer set it otherwise
- m_pOptions->InitOption(OPT_SELECTED_LANGUAGE, 0x409);
+ // Default language to System Language ID unless installer set it otherwise
+ m_pOptions->InitOption(OPT_SELECTED_LANGUAGE, (int)GetSystemDefaultLCID());
// Initialise options (name, default value)
m_pOptions->InitOption(OPT_SHOW_UNIQUE_LEFT, true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-17 19:27:13
|
Revision: 7612
http://sourceforge.net/p/winmerge/code/7612
Author: christianlist
Date: 2013-03-17 19:27:10 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
[patches:#3029] Some sentences are wrong in russian translation for WinMerge 2.14.0
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Russian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2013-03-17 19:25:06 UTC (rev 7611)
+++ trunk/Docs/Users/ChangeLog.txt 2013-03-17 19:27:10 UTC (rev 7612)
@@ -31,7 +31,7 @@
- French (#3412030)
- Hungarian (#3164982)
- Spanish (#3412937, patches:#3027)
- - Russian (patches:#3017)
+ - Russian (patches:#3017, patches:#3029)
- Norwegian (patches:#3018)
- Danish (patches:#3019)
- Dutch (patches:#3020)
Modified: trunk/Translations/WinMerge/Russian.po
===================================================================
--- trunk/Translations/WinMerge/Russian.po 2013-03-17 19:25:06 UTC (rev 7611)
+++ trunk/Translations/WinMerge/Russian.po 2013-03-17 19:27:10 UTC (rev 7612)
@@ -811,7 +811,7 @@
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xFB&\xE2\xE0\xF2\xFC \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xCF\xEE\xEA\xE0\xE7\xFB&\xE2\xE0\xF2\xFC \xEF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:409
#, c-format
@@ -1326,7 +1326,7 @@
#: Merge.rc:783
#, c-format
msgid "Enable multiple compare windows for"
-msgstr "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEE\xEA\xED\xE0 \xEC\xED\xEE\xE6\xE5\xF1\xF2\xE2\xE5\xED\xED\xEE\xE3\xEE \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF"
+msgstr "\xD0\xE0\xE7\xF0\xE5\xF8\xE8\xF2\xFC \xED\xE5\xF1\xEA\xEE\xEB\xFC\xEA\xEE \xEE\xEA\xEE\xED \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF"
#: Merge.rc:785
#: Merge.rc:1609
@@ -1679,7 +1679,7 @@
#: Merge.rc:1045
#, c-format
msgid "W&hitespaces"
-msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:1046
#, c-format
@@ -1826,22 +1826,22 @@
#: Merge.rc:1160
#, c-format
msgid "Whitespace"
-msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:1161
#, c-format
msgid "&Compare"
-msgstr "\xD3\xF7\xE8\xF2\xFB\xE2\xE0\xF2\xFC &\xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xD3\xF7\xE8\xF2\xFB\xE2\xE0\xF2\xFC &\xEF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:1162
#, c-format
msgid "&Ignore change"
-msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE8\xE7\xEC\xE5\xED\xE5\xED\xED\xFB\xE5 \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xF1\xEC\xE5\xED\xF3"
#: Merge.rc:1163
#, c-format
msgid "I&gnore all"
-msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xE2\xF1\xE5 \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xE2\xF1\xE5 \xEF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:1164
#, c-format
@@ -2475,7 +2475,7 @@
#: Merge.rc:1558
#, c-format
msgid "Whitespace:"
-msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5:"
+msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB:"
#: Merge.rc:1559
#, c-format
@@ -2521,7 +2521,7 @@
#: Merge.rc:1608
#, c-format
msgid "Create backup files in:"
-msgstr "\xD1\xEE\xE7\xE4\xE0\xF2\xFC \xF0\xE5\xE7\xE5\xF0\xE2\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xE2:"
+msgstr "\xD1\xEE\xE7\xE4\xE0\xF2\xFC \xF0\xE5\xE7\xE5\xF0\xE2\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xE4\xEB\xFF:"
#: Merge.rc:1613
#, c-format
@@ -3253,7 +3253,7 @@
#: Merge.rc:1956
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "\xD1\xE8\xED\xF2\xE0\xEA\xF1\xE8\xF1"
#: Merge.rc:1958
#, c-format
@@ -4009,12 +4009,12 @@
#: Merge.rc:2201
#, c-format
msgid "Break at whitespace"
-msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xEC"
+msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xEF\xF0\xEE\xE1\xE5\xEB\xE0\xEC"
#: Merge.rc:2202
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xEC \xE8 \xE7\xED\xE0\xEA\xE0\xEC \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xE8\xE8"
+msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xEF\xF0\xEE\xE1\xE5\xEB\xE0\xEC \xE8 \xE7\xED\xE0\xEA\xE0\xEC \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xE8\xE8"
#: Merge.rc:2208
#: Merge.rc:2210
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-17 19:25:09
|
Revision: 7611
http://sourceforge.net/p/winmerge/code/7611
Author: christianlist
Date: 2013-03-17 19:25:06 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
[patches:#3029] Some sentences are wrong in russian translation for WinMerge 2.14.0
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/Languages/Russian.po
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-11 03:14:06 UTC (rev 7610)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-17 19:25:06 UTC (rev 7611)
@@ -10,6 +10,7 @@
- Basque (patches:#3024)
- Spanish (patches:#3027)
- Italian (patches:#3028)
+ - Russian (patches:#3029)
WinMerge 2.14.0 - 2013-02-02 (r7596)
Bugfix: Shell extension uses unquoted program path (patches:#3023)
Modified: branches/R2_14/Src/Languages/Russian.po
===================================================================
--- branches/R2_14/Src/Languages/Russian.po 2013-03-11 03:14:06 UTC (rev 7610)
+++ branches/R2_14/Src/Languages/Russian.po 2013-03-17 19:25:06 UTC (rev 7611)
@@ -811,7 +811,7 @@
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xFB&\xE2\xE0\xF2\xFC \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xCF\xEE\xEA\xE0\xE7\xFB&\xE2\xE0\xF2\xFC \xEF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:409
#, c-format
@@ -1326,7 +1326,7 @@
#: Merge.rc:783
#, c-format
msgid "Enable multiple compare windows for"
-msgstr "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEE\xEA\xED\xE0 \xEC\xED\xEE\xE6\xE5\xF1\xF2\xE2\xE5\xED\xED\xEE\xE3\xEE \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF"
+msgstr "\xD0\xE0\xE7\xF0\xE5\xF8\xE8\xF2\xFC \xED\xE5\xF1\xEA\xEE\xEB\xFC\xEA\xEE \xEE\xEA\xEE\xED \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF"
#: Merge.rc:785
#: Merge.rc:1601
@@ -1679,7 +1679,7 @@
#: Merge.rc:1039
#, c-format
msgid "W&hitespaces"
-msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:1040
#, c-format
@@ -1826,22 +1826,22 @@
#: Merge.rc:1154
#, c-format
msgid "Whitespace"
-msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:1155
#, c-format
msgid "&Compare"
-msgstr "\xD3\xF7\xE8\xF2\xFB\xE2\xE0\xF2\xFC &\xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xD3\xF7\xE8\xF2\xFB\xE2\xE0\xF2\xFC &\xEF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:1156
#, c-format
msgid "&Ignore change"
-msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE8\xE7\xEC\xE5\xED\xE5\xED\xED\xFB\xE5 \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xF1\xEC\xE5\xED\xF3"
#: Merge.rc:1157
#, c-format
msgid "I&gnore all"
-msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xE2\xF1\xE5 \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5"
+msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xE2\xF1\xE5 \xEF\xF0\xEE\xE1\xE5\xEB\xFB"
#: Merge.rc:1158
#, c-format
@@ -2470,7 +2470,7 @@
#: Merge.rc:1550
#, c-format
msgid "Whitespace:"
-msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5:"
+msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB:"
#: Merge.rc:1551
#, c-format
@@ -2516,7 +2516,7 @@
#: Merge.rc:1600
#, c-format
msgid "Create backup files in:"
-msgstr "\xD1\xEE\xE7\xE4\xE0\xF2\xFC \xF0\xE5\xE7\xE5\xF0\xE2\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xE2:"
+msgstr "\xD1\xEE\xE7\xE4\xE0\xF2\xFC \xF0\xE5\xE7\xE5\xF0\xE2\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xE4\xEB\xFF:"
#: Merge.rc:1605
#, c-format
@@ -3243,7 +3243,7 @@
#: Merge.rc:1946
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "\xD1\xE8\xED\xF2\xE0\xEA\xF1\xE8\xF1"
#: Merge.rc:1948
#, c-format
@@ -3999,12 +3999,12 @@
#: Merge.rc:2191
#, c-format
msgid "Break at whitespace"
-msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xEC"
+msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xEF\xF0\xEE\xE1\xE5\xEB\xE0\xEC"
#: Merge.rc:2192
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xEC \xE8 \xE7\xED\xE0\xEA\xE0\xEC \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xE8\xE8"
+msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xEF\xF0\xEE\xE1\xE5\xEB\xE0\xEC \xE8 \xE7\xED\xE0\xEA\xE0\xEC \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xE8\xE8"
#: Merge.rc:2198
#: Merge.rc:2200
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-11 03:14:10
|
Revision: 7610
http://sourceforge.net/p/winmerge/code/7610
Author: christianlist
Date: 2013-03-11 03:14:06 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
[patches:#3028] WinMerge 2.14.0 Italian Translation Update
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Italian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2013-03-11 02:37:57 UTC (rev 7609)
+++ trunk/Docs/Users/ChangeLog.txt 2013-03-11 03:14:06 UTC (rev 7610)
@@ -36,6 +36,7 @@
- Danish (patches:#3019)
- Dutch (patches:#3020)
- Slovenian (patches:#3022)
+ - Italian (patches:#3028)
WinMerge 2.13.14 - 2010-09-15 (r7263)
Update release compiler and runtimes to VS2008
Modified: trunk/Translations/WinMerge/Italian.po
===================================================================
--- trunk/Translations/WinMerge/Italian.po 2013-03-11 02:37:57 UTC (rev 7609)
+++ trunk/Translations/WinMerge/Italian.po 2013-03-11 03:14:06 UTC (rev 7610)
@@ -5,17 +5,18 @@
# * Michele Merega <michele.merega at ifminfomaster.com>
# * Andrea Decorte <deco1985 at hotmail.com>
# * Antonio Angelo <antonio.angelo at gmail.com>
+# * Luca Gori <grojunk at gmail.com>
#
# ID line follows -- this is updated by SVN
# $Id$
msgid ""
msgstr ""
"Project-Id-Version: Italian\n"
-"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: 2008-03-04 18:02+0000\n"
-"PO-Revision-Date: 2008-04-10 11:13+0100\n"
-"Last-Translator: Antonio Angelo <antonio.angelo at gmail.com>\n"
-"Language-Team: Italian\n"
+"PO-Revision-Date: 2013-02-10 11:13+0100\n"
+"Last-Translator: Luca Gori <grojunk at gmail.com>\n"
+"Language-Team: Italian <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=windows-1252\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -75,7 +76,7 @@
#: Merge.rc:512
#, c-format
msgid "&Copy"
-msgstr "C&opia"
+msgstr "C&opia..."
#: Merge.rc:82
#: Merge.rc:104
@@ -92,28 +93,28 @@
#: Merge.rc:86
#, c-format
msgid "Op&en"
-msgstr "&Apri"
+msgstr "&Apri con..."
#: Merge.rc:88
#: Merge.rc:535
#: Merge.rc:541
#, c-format
msgid "with &Registered Application"
-msgstr "con l'applicazione ®istrata"
+msgstr "&Applicazione registrata"
#: Merge.rc:89
#: Merge.rc:536
#: Merge.rc:542
#, c-format
msgid "with &External Editor"
-msgstr "con l'editor &esterno"
+msgstr "&Editor esterno"
#: Merge.rc:90
#: Merge.rc:537
#: Merge.rc:543
#, c-format
msgid "&with..."
-msgstr "&con..."
+msgstr "&Scegli programma..."
#: Merge.rc:110
#: Merge.rc:194
@@ -286,17 +287,17 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Elenco..."
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "Prediffer ma&nuale"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "Prediffer A&utomatico"
#: Merge.rc:155
#: Merge.rc:276
@@ -409,7 +410,7 @@
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "Guida &WinMerge\tF1"
+msgstr "Guida di &WinMerge\tF1"
#: Merge.rc:182
#: Merge.rc:303
@@ -423,7 +424,7 @@
#: Merge.rc:492
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "&Traduzioni"
#: Merge.rc:184
#: Merge.rc:305
@@ -444,7 +445,7 @@
#: Merge.rc:496
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "&GNU General Public License"
#: Merge.rc:188
#: Merge.rc:309
@@ -457,13 +458,13 @@
#: Merge.rc:340
#, c-format
msgid "L&eft Read-only"
-msgstr "Fil&e di sinistra di Sola lettura"
+msgstr "Fil&e del riquadro di sinistra di Sola lettura"
#: Merge.rc:204
#: Merge.rc:341
#, c-format
msgid "Ri&ght Read-only"
-msgstr "F&ile di destra di Sola lettura"
+msgstr "F&ile del riquadro di destra di Sola lettura"
#: Merge.rc:206
#, c-format
@@ -514,17 +515,17 @@
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Modalit\xE0 struttura"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "E&spandi tutte le sottocartelle"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Comprimi tutte le sottocartelle"
#: Merge.rc:242
#, c-format
@@ -620,7 +621,7 @@
#: Merge.rc:325
#, c-format
msgid "Save &Left"
-msgstr "Sa&lva sinistro"
+msgstr "Sa&lva riquadro sinistro"
#: Merge.rc:327
#: Merge.rc:332
@@ -632,12 +633,12 @@
#: Merge.rc:333
#, c-format
msgid "Save &As..."
-msgstr "S&alva con nome..."
+msgstr "S&alva come..."
#: Merge.rc:330
#, c-format
msgid "Save &Right"
-msgstr "Salva dest&ro"
+msgstr "Salva riquadro dest&ro"
#: Merge.rc:336
#, c-format
@@ -657,27 +658,27 @@
#: Merge.rc:343
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&Converti caratteri di fine linea a"
+msgstr "&Converti caratteri di fine riga in..."
#: Merge.rc:345
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:346
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:347
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:350
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "&Modalit\xE0 'Unione'\tF9"
+msgstr "&Modalit\xE0 Unione\tF9"
#: Merge.rc:352
#, c-format
@@ -738,7 +739,7 @@
#: Merge.rc:376
#, c-format
msgid "Advanced"
-msgstr "Avanzat&e"
+msgstr "Avanzate"
#: Merge.rc:378
#, c-format
@@ -778,7 +779,7 @@
#: Merge.rc:396
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "&Zoom"
#: Merge.rc:398
#, c-format
@@ -809,12 +810,12 @@
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "&Visualizza spazi bianchi"
+msgstr "&Visualizza spazi vuoti"
#: Merge.rc:409
#, c-format
msgid "Vie&w Line Differences"
-msgstr "Visualizza &differenze nelle linee"
+msgstr "Visualizza &differenze nelle righe"
#: Merge.rc:410
#, c-format
@@ -839,12 +840,12 @@
#: Merge.rc:424
#, c-format
msgid "Diff &Pane"
-msgstr "&Pannello delle differenze"
+msgstr "&Riquadro delle differenze"
#: Merge.rc:425
#, c-format
msgid "Lo&cation Pane"
-msgstr "Pannello della loca&zione"
+msgstr "Riquadro della posi&zione"
#: Merge.rc:443
#, c-format
@@ -879,22 +880,22 @@
#: Merge.rc:506
#, c-format
msgid "Co&mpare As"
-msgstr ""
+msgstr "Co&nfronta come..."
#: Merge.rc:508
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:509
#, c-format
msgid "&Binary"
-msgstr ""
+msgstr "&Binario"
#: Merge.rc:514
#, c-format
msgid "&Left to Right"
-msgstr "Da &Sinistra a Destra"
+msgstr "da &Sinistra verso Destra"
#: Merge.rc:515
#, c-format
@@ -904,7 +905,7 @@
#: Merge.rc:516
#, c-format
msgid "&Right to Left"
-msgstr "Da &Destra a Sinistra"
+msgstr "da &Destra verso Sinistra"
#: Merge.rc:517
#, c-format
@@ -936,14 +937,14 @@
#: Merge.rc:1509
#, c-format
msgid "&Left"
-msgstr "&Sinistra"
+msgstr "&Sinistro"
#: Merge.rc:527
#: Merge.rc:1144
#: Merge.rc:1512
#, c-format
msgid "&Right"
-msgstr "&Destra"
+msgstr "&Destro"
#: Merge.rc:528
#, c-format
@@ -963,12 +964,12 @@
#: Merge.rc:533
#, c-format
msgid "&Open Left"
-msgstr "Apri &file di sinistra"
+msgstr "Apri &file di sinistra con..."
#: Merge.rc:539
#, c-format
msgid "O&pen Right"
-msgstr "A&pri file di destra"
+msgstr "A&pri file di destra con..."
#: Merge.rc:546
#, c-format
@@ -978,17 +979,17 @@
#: Merge.rc:548
#, c-format
msgid "&Left (%1 of %2)"
-msgstr "&Sinistra (%1 su %2)"
+msgstr "&Sinistra (%1 di %2)"
#: Merge.rc:549
#, c-format
msgid "&Right (%1 of %2)"
-msgstr "&Destra (%1 su %2)"
+msgstr "&Destra (%1 di %2)"
#: Merge.rc:550
#, c-format
msgid "&Both (%1 of %2)"
-msgstr "&Entrambi (%1 su %2)"
+msgstr "&Entrambi (%1 di %2)"
#: Merge.rc:552
#, c-format
@@ -998,27 +999,27 @@
#: Merge.rc:554
#, c-format
msgid "&Zip"
-msgstr "&Zippa"
+msgstr "Comprimi (&Zip)"
#: Merge.rc:556
#, c-format
msgid "&Left... (%1 of %2)"
-msgstr "&Sinistra... (%1 su %2)"
+msgstr "&Sinistra... (%1 di %2)"
#: Merge.rc:557
#, c-format
msgid "&Right... (%1 of %2)"
-msgstr "&Destra... (%1 su %2)"
+msgstr "&Destra... (%1 di %2)"
#: Merge.rc:558
#, c-format
msgid "&Both... (%1 of %2)"
-msgstr "&Entrambi... (%1 su %2)"
+msgstr "&Entrambi... (%1 di %2)"
#: Merge.rc:559
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr "Di&fferenze... (%1 su %2)"
+msgstr "Di&fferenze... (%1 di %2)"
#: Merge.rc:562
#, c-format
@@ -1043,7 +1044,7 @@
#: Merge.rc:583
#, c-format
msgid "&No prediffer"
-msgstr "&No prediffer"
+msgstr "&Senza prediffer"
#: Merge.rc:584
#, c-format
@@ -1115,7 +1116,7 @@
#: Merge.rc:685
#, c-format
msgid "Select Files or Folders"
-msgstr "Seleziona i file o le cartelle"
+msgstr "Seleziona file o cartelle"
#: Merge.rc:688
#: Merge.rc:1586
@@ -1204,7 +1205,7 @@
#: Merge.rc:712
#, c-format
msgid "Files or Folders to Compare"
-msgstr "File o cartelle da confrontare"
+msgstr "File o cartelle da confrontare:"
#: Merge.rc:719
#, c-format
@@ -1289,12 +1290,12 @@
#: Merge.rc:766
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "C&hiudi finestra con ESC"
+msgstr "C&hiudi le finestre con il tasto ESC"
#: Merge.rc:768
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "Verifica &automaticamente i percorsi nella finestra Apri"
+msgstr "Verifica &automaticamente i percorsi nella finestra \"Apri...\""
#: Merge.rc:771
#, c-format
@@ -1304,17 +1305,17 @@
#: Merge.rc:773
#, c-format
msgid "As&k when closing multiple windows"
-msgstr "Domanda alla c&hiusura di pi\xF9 finestre"
+msgstr "Visualizza conferma alla c&hiusura di pi\xF9 finestre"
#: Merge.rc:775
#, c-format
msgid "&Preserve file time in file compare"
-msgstr "&Preserva orario del file durante il confronto"
+msgstr "Mantieni l'ora del file durante il confronto"
#: Merge.rc:778
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "All'avvio mostra la finesta di dialogo \"Seleziona file o cartelle\""
#: Merge.rc:780
#, c-format
@@ -1324,24 +1325,24 @@
#: Merge.rc:783
#, c-format
msgid "Enable multiple compare windows for"
-msgstr "Attiva finestra di confronto multiplo per"
+msgstr "Abilita finestre di confronto multiplo per:"
#: Merge.rc:785
#: Merge.rc:1609
#, c-format
msgid "&Folder compare"
-msgstr "Confron&to di cartelle"
+msgstr "Comparazione delle &cartelle"
#: Merge.rc:787
#: Merge.rc:1611
#, c-format
msgid "Fil&e compare"
-msgstr "Confronto di &file"
+msgstr "Comparazione dei &file"
#: Merge.rc:789
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante Ripristina per rendere di nuovo visibili tutti i messaggi."
+msgstr "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante \"Ripristina\" per rendere di nuovo visibili tutti i messaggi."
#: Merge.rc:791
#, c-format
@@ -1379,7 +1380,7 @@
#: Merge.rc:849
#, c-format
msgid "Match &case"
-msgstr "&Maiuscolo/Minuscolo"
+msgstr "&Maiuscole/minuscole"
#: Merge.rc:821
#: Merge.rc:851
@@ -1411,7 +1412,7 @@
#: Merge.rc:861
#, c-format
msgid "&Find Next"
-msgstr "&Trova succ."
+msgstr "&Successivo"
#: Merge.rc:838
#, c-format
@@ -1431,17 +1432,17 @@
#: Merge.rc:856
#, c-format
msgid "Replace in"
-msgstr "Sostituisci in"
+msgstr "Sostituisci:"
#: Merge.rc:857
#, c-format
msgid "&Selection"
-msgstr "Sele&zione"
+msgstr "Nella sele&zione"
#: Merge.rc:859
#, c-format
msgid "Wh&ole file"
-msgstr "T&utto il file"
+msgstr "In t&utto il file"
#: Merge.rc:862
#, c-format
@@ -1468,7 +1469,7 @@
#: Merge.rc:1170
#, c-format
msgid "Comments"
-msgstr "Commenti"
+msgstr "Commenti:"
#: Merge.rc:881
#, c-format
@@ -1478,12 +1479,12 @@
#: Merge.rc:887
#, c-format
msgid "Linefilters"
-msgstr "Filtri di linee"
+msgstr "Filtri per le righe"
#: Merge.rc:890
#, c-format
msgid "Enable Line Filters"
-msgstr "Attiva i filtri di linee"
+msgstr "Attiva filtri per le righe"
#: Merge.rc:893
#, c-format
@@ -1548,22 +1549,22 @@
#: Merge.rc:944
#, c-format
msgid "Moved:"
-msgstr "Spostata:"
+msgstr "Spostamento:"
#: Merge.rc:954
#, c-format
msgid "Selected Moved:"
-msgstr "Spostata selezionata:"
+msgstr "Spostamento selezione:"
#: Merge.rc:961
#, c-format
msgid "Word Difference:"
-msgstr "Differenza di parole:"
+msgstr "Differenza parole:"
#: Merge.rc:971
#, c-format
msgid "Selected Word Diff:"
-msgstr "Diff. parole selezionata:"
+msgstr "Parola selezionata diff.:"
#: Merge.rc:981
#: Merge.rc:1060
@@ -1591,7 +1592,7 @@
#: Merge.rc:1000
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr "&Posiziona i file eliminati nel cestino"
+msgstr "&Sposta i file cancellati nel cestino"
#: Merge.rc:1002
#, c-format
@@ -1611,17 +1612,17 @@
#: Merge.rc:1008
#, c-format
msgid "Temporary files folder"
-msgstr "Cartella file temporanei"
+msgstr "Cartella dei file temporanei:"
#: Merge.rc:1009
#, c-format
msgid "S&ystem's temp folder"
-msgstr "Cartella temporanea di s&istema"
+msgstr "Cartella dei file temporanei del s&istema"
#: Merge.rc:1011
#, c-format
msgid "C&ustom folder:"
-msgstr "Cartella &utente:"
+msgstr "Cartella personalizzata:"
#: Merge.rc:1014
#: Merge.rc:1030
@@ -1737,17 +1738,17 @@
#: Merge.rc:1102
#, c-format
msgid "File unpacker:"
-msgstr "Scompattatore di file:"
+msgstr "Scompattatore:"
#: Merge.rc:1105
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr "Visualizza tutti gli scompattatori, non verificare l'estensione"
+msgstr "Visualizza tutti gli scompattatori (non verificare estensione)"
#: Merge.rc:1108
#, c-format
msgid "Extensions list:"
-msgstr "Lista delle estensioni:"
+msgstr "Elenco estensioni:"
#: Merge.rc:1109
#, c-format
@@ -1783,12 +1784,12 @@
#: Merge.rc:1136
#, c-format
msgid "Go To"
-msgstr "Vai a"
+msgstr "Vai a..."
#: Merge.rc:1139
#, c-format
msgid "G&oto:"
-msgstr "Va&i a:"
+msgstr "Punto:"
#: Merge.rc:1141
#, c-format
@@ -1798,12 +1799,12 @@
#: Merge.rc:1146
#, c-format
msgid "Goto what"
-msgstr "Vai a ..."
+msgstr "Posizionamento:"
#: Merge.rc:1147
#, c-format
msgid "Li&ne"
-msgstr "Li&nea"
+msgstr "Ri&ga"
#: Merge.rc:1149
#, c-format
@@ -1819,12 +1820,12 @@
#: Merge.rc:1952
#, c-format
msgid "Compare"
-msgstr "Confronto"
+msgstr "Comparazione"
#: Merge.rc:1160
#, c-format
msgid "Whitespace"
-msgstr "Spazi bianchi"
+msgstr "Spazi vuoti:"
#: Merge.rc:1161
#, c-format
@@ -1844,17 +1845,17 @@
#: Merge.rc:1164
#, c-format
msgid "Ignore blan&k lines"
-msgstr "Ign&ora le linee vuote"
+msgstr "Ign&ora le righe vuote"
#: Merge.rc:1165
#, c-format
msgid "Ignore &case"
-msgstr "Ig&nora le differenze tra maiuscole e minuscole"
+msgstr "Ig&nora le differenze tra MAIUSCOLE e minuscole"
#: Merge.rc:1166
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "I&gnora differenze nei fine riga (Windows/Unix/Mac)"
+msgstr "I&gnora differenze di ritorno a capo (Windows/Unix/Mac)"
#: Merge.rc:1168
#, c-format
@@ -1864,7 +1865,7 @@
#: Merge.rc:1169
#, c-format
msgid "&Match similar lines"
-msgstr "&Metti in corrispondenza linee simili"
+msgstr "&Metti in corrispondenza righe simili"
#: Merge.rc:1171
#, c-format
@@ -1885,12 +1886,12 @@
#: Merge.rc:1182
#, c-format
msgid "&Automatic rescan"
-msgstr "Riscansiona &automaticamente"
+msgstr "Ripeti scansione &automaticamente"
#: Merge.rc:1184
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "&Conserva i caratteri originali di fine riga"
+msgstr "&Mantieni caratteri EOL (fine riga) originali"
#: Merge.rc:1186
#, c-format
@@ -1900,7 +1901,7 @@
#: Merge.rc:1187
#, c-format
msgid "&Tab size:"
-msgstr "&Dimensioni:"
+msgstr "&Formato:"
#: Merge.rc:1190
#, c-format
@@ -1910,27 +1911,27 @@
#: Merge.rc:1192
#, c-format
msgid "Insert &Spaces"
-msgstr "In&serisci spazi"
+msgstr "In&serisci spazio"
#: Merge.rc:1194
#, c-format
msgid "Line Difference Coloring"
-msgstr "Colorazione delle differenze di linea"
+msgstr "Colorazione differenza riga"
#: Merge.rc:1196
#, c-format
msgid "View line differences"
-msgstr "Mostra differenze di linea"
+msgstr "Mostra differenze di riga"
#: Merge.rc:1198
#, c-format
msgid "&Character level"
-msgstr "Livello &caratteri"
+msgstr "a livello di &caratteri"
#: Merge.rc:1200
#, c-format
msgid "&Word-level:"
-msgstr "Livello &parole:"
+msgstr "a livello di &parole:"
#: Merge.rc:1204
#, c-format
@@ -1940,7 +1941,7 @@
#: Merge.rc:1217
#, c-format
msgid "Filefilters"
-msgstr "Filtri di file"
+msgstr "Filtri per i file"
#: Merge.rc:1223
#, c-format
@@ -1975,7 +1976,7 @@
#: Merge.rc:1236
#, c-format
msgid "Left side file"
-msgstr "File sul lato sinistro"
+msgstr "File lato sinistro"
#: Merge.rc:1239
#, c-format
@@ -1985,12 +1986,12 @@
#: Merge.rc:1241
#, c-format
msgid "&Discard changes"
-msgstr "S&carta le modifiche"
+msgstr "Ignora le modifiche"
#: Merge.rc:1243
#, c-format
msgid "Right side file"
-msgstr "File sul lato destro"
+msgstr "File lato destro"
#: Merge.rc:1246
#, c-format
@@ -2000,7 +2001,7 @@
#: Merge.rc:1248
#, c-format
msgid "Dis&card changes"
-msgstr "Sca&rta le modifiche"
+msgstr "Ignora le modifiche"
#: Merge.rc:1250
#, c-format
@@ -2027,7 +2028,7 @@
#: Merge.rc:1263
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr ""
+msgstr "Rileva informazioni sul codice di pagina per \n i file con questa estensione: .html, .rc, .xml \n(occorre riavviare la sessione)"
#: Merge.rc:1266
#, c-format
@@ -2037,12 +2038,12 @@
#: Merge.rc:1268
#, c-format
msgid "According to WinMerge User Interface"
-msgstr "In accordo con l'interfaccia di WinMerge"
+msgstr "In base all'nterfaccia utente di WinMerge"
#: Merge.rc:1270
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Codice di pagina personalizzato:"
#: Merge.rc:1278
#, c-format
@@ -2103,7 +2104,7 @@
#: Merge.rc:1298
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
#: Merge.rc:1301
#, c-format
@@ -2158,7 +2159,7 @@
#: Merge.rc:1336
#, c-format
msgid " Categories"
-msgstr " Categorie"
+msgstr " Categorie:"
#: Merge.rc:1338
#, c-format
@@ -2280,27 +2281,27 @@
#: Merge.rc:1960
#, c-format
msgid "Archive Support"
-msgstr "Supporto per gli archivi"
+msgstr "File compressi"
#: Merge.rc:1444
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "Il supporto per gli archivi richiede l'installazione del plugin per 7-Zip:"
+msgstr "Il supporto per i file compressi richiede il plugin per 7-Zip:"
#: Merge.rc:1446
#, c-format
msgid "Download 7-zip Plugin"
-msgstr "Scarica il plugin per 7-Zip"
+msgstr "Scarica plugin 7-Zip"
#: Merge.rc:1447
#, c-format
msgid "&Enable archive file support"
-msgstr "&Attiva il supporto per i file di archivio"
+msgstr "&Abilita il supporto per i file compressi"
#: Merge.rc:1449
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr "&Utilizza installazione standard di 7-Zip se disponibile"
+msgstr "&Utilizza 7-Zip stand-alone se disponibile"
#: Merge.rc:1452
#, c-format
@@ -2378,18 +2379,18 @@
#: Merge.rc:1508
#, c-format
msgid "Affects"
-msgstr "Coinvolge"
+msgstr "Applica a:"
#: Merge.rc:1511
#: Merge.rc:1514
#, c-format
msgid "(Affects)"
-msgstr "(Coinvolge)"
+msgstr "(Applicati)"
#: Merge.rc:1515
#, c-format
msgid "Select Codepage for"
-msgstr "Scegli codice di pagina per"
+msgstr "Seleziona codice di pagina per:"
#: Merge.rc:1516
#, c-format
@@ -2466,12 +2467,12 @@
#: Merge.rc:1556
#, c-format
msgid "Custom text colors"
-msgstr "Colori personalizzati per il testo"
+msgstr "Colori testo personalizzati:"
#: Merge.rc:1558
#, c-format
msgid "Whitespace:"
-msgstr "Spazi bianchi:"
+msgstr "Spazi vuoti:"
#: Merge.rc:1559
#, c-format
@@ -2583,23 +2584,23 @@
#: Merge.rc:1649
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugin"
#: Merge.rc:1652
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Abilita plugin"
#: Merge.rc:1663
#: Merge.rc:1962
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Integrazione della shell"
#: Merge.rc:1666
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1667
#, c-format
@@ -2614,17 +2615,17 @@
#: Merge.rc:1671
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&Aggiungi al menu contestuale"
#: Merge.rc:1673
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Confronta cartella"
#: Merge.rc:1674
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "Aggiungi menu della &Shell al menu contestuale"
#: Merge.rc:1681
#: Merge.rc:1965
@@ -2636,7 +2637,7 @@
#: Merge.rc:1684
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "&Metodo di confronto:"
#: Merge.rc:1686
#, c-format
@@ -2656,7 +2657,7 @@
#: Merge.rc:1692
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "Limite per il confronto &rapido (MB):"
#. StringFileInfo.Block
#: Merge.rc:1718
@@ -2711,8 +2712,8 @@
"Create empty documents\n"
"New Documents (Ctrl+N)"
msgstr ""
-"Crea due nuovi documenti vuoti\n"
-"Nuovi documenti (Ctrl+N)"
+"Crea un nuovo documento\n"
+"Nuovo (Ctrl+N)"
#: Merge.rc:1767
#, c-format
@@ -2794,17 +2795,17 @@
#: Merge.rc:1780
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Attiva/Disattiva modalit\xE0 struttura"
#: Merge.rc:1781
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Espandi tutte le sottocartelle"
#: Merge.rc:1782
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Comprimi tutte le sottocartelle"
#: Merge.rc:1788
#, c-format
@@ -2812,8 +2813,8 @@
"Open project file\n"
"Project file (Ctrl+J)"
msgstr ""
-"Apre un file di progetto\n"
-"File di progetto (Ctrl+J)"
+"Apre un file progetto\n"
+"File progetto (Ctrl+J)"
#: Merge.rc:1789
#, c-format
@@ -2828,7 +2829,7 @@
#: Merge.rc:1791
#, c-format
msgid "Project File"
-msgstr "File di progetto"
+msgstr "File progetto"
#: Merge.rc:1792
#, c-format
@@ -2846,8 +2847,8 @@
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
-"Salva i percorsi correnti e le opzioni in un file di progetto\n"
-"Salva il file di progetto"
+"Salva le opzioni e i percorsi per il file progetto\n"
+"Salva file progetto"
#: Merge.rc:1799
#, c-format
@@ -2855,8 +2856,8 @@
"Display program information, version number and copyright\n"
"About"
msgstr ""
-"Visualizza le informazioni sul programma, il numero di versione e le informazioni di copyright\n"
-"Informazioni su"
+"Visualizza le informazioni sul programma, il numero di versione e il copyright\n"
+"Informazioni su..."
#: Merge.rc:1800
#, c-format
@@ -2893,7 +2894,7 @@
"Switch to the next window pane\n"
"Next Pane"
msgstr ""
-"Passa al riquadro della finestra successivo\n"
+"Passa al riquadro della finestra successiva\n"
"Riquadro successivo"
#: Merge.rc:1827
@@ -2902,7 +2903,7 @@
"Switch back to the previous window pane\n"
"Previous Pane"
msgstr ""
-"Ritorna al riquadro della finestra precedente\n"
+"Torna al riquadro della finestra precedente\n"
"Riquadro precedente"
#: Merge.rc:1833
@@ -2965,7 +2966,7 @@
"Insert Clipboard contents\n"
"Paste"
msgstr ""
-"Inserisce il contenuto degli Appunti\n"
+"Inserisce il contenuto degli Appunti nella posizione selezionata\n"
"Incolla"
#: Merge.rc:1845
@@ -3072,12 +3073,12 @@
#: Merge.rc:1868
#, c-format
msgid "Switch to the next document window"
-msgstr "Passa alla finestra successiva del documento "
+msgstr "Passare alla finestra del documento successivo"
#: Merge.rc:1869
#, c-format
msgid "Switch to the previous document window"
-msgstr "Passa alla finestra precedente del documento"
+msgstr "Passare alla finestra del documento precedente"
#: Merge.rc:1870
#, c-format
@@ -3138,11 +3139,18 @@
"WinMerge.FolderCompare\n"
"WinMerge Folder Compare"
msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
#: Merge.rc:1898
#, c-format
msgid "Preserve original EOL chars"
-msgstr "Conserva caratteri di fine linea originali"
+msgstr "Mantieni caratteri EOL (fine riga) originali"
#: Merge.rc:1905
#, c-format
@@ -3237,12 +3245,12 @@
#: Merge.rc:1945
#, c-format
msgid "Don't ask this &question again."
-msgstr "Non farmi pi\xF9 &questa domanda."
+msgstr "Non visualizzare pi\xF9 &questa finestra."
#: Merge.rc:1956
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "Sintassi"
#: Merge.rc:1958
#, c-format
@@ -3293,7 +3301,7 @@
#: Merge.rc:1984
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1990
#, c-format
@@ -3380,32 +3388,32 @@
#: Merge.rc:2022
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:2023
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:2024
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:2025
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:2031
#, c-format
msgid "Full Contents"
-msgstr "Contenuti completi"
+msgstr "Contenuto (completo)"
#: Merge.rc:2032
#, c-format
msgid "Quick Contents"
-msgstr "Contenuti rapidi"
+msgstr "Contenuto (rapido)"
#: Merge.rc:2033
#, c-format
@@ -3538,12 +3546,12 @@
#: Merge.rc:2072
#, c-format
msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
-msgstr ""
+msgstr "I filtri sono stati aggiornati. Vuoi adeguare le cartelle aperte per il confronto?\n\nScegliendo No \xE8 possibile non adeguare adesso le cartelle e farlo in seguito."
#: Merge.rc:2079
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "Percorso SS.EXE"
#: Merge.rc:2085
#, c-format
@@ -3628,12 +3636,12 @@
#: Merge.rc:2106
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Annullamento dell'ultima operazione..."
#: Merge.rc:2107
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Ripristino dell'operazione precedente..."
#: Merge.rc:2113
#, c-format
@@ -3658,7 +3666,7 @@
#: Merge.rc:2117
#, c-format
msgid "Difference %1 of %2"
-msgstr "Differenza %1 su %2"
+msgstr "Differenza %1 di %2"
#: Merge.rc:2118
#, c-format
@@ -3679,7 +3687,7 @@
#: Merge.rc:2126
#, c-format
msgid "Item %1 of %2"
-msgstr "Elemento %1 su %2"
+msgstr "Elemento %1 di %2"
#: Merge.rc:2127
#, c-format
@@ -3719,7 +3727,7 @@
#: Merge.rc:2139
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Seleziona due file per attivare la selezione dello scompattatore."
+msgstr "Scegli due file per attivare lo scompattatore."
#: Merge.rc:2140
#, c-format
@@ -3752,7 +3760,7 @@
#: Merge.rc:2149
#, c-format
msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "Impossibile analizzare il file in conflitto."
#: Merge.rc:2150
#, c-format
@@ -3877,7 +3885,7 @@
#: Merge.rc:2168
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
-msgstr ""
+msgstr "Un'altra applicazione ha aggiornato il file\n%1\nda quando \xE8 stato analizzato l'ultima volta con WinMerge.\n\nVuoi ricaricare il file?"
#: Merge.rc:2169
#, c-format
@@ -3892,7 +3900,7 @@
#: Merge.rc:2171
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
-msgstr ""
+msgstr "Non \xE8 possibile trovare il file\n%1.\nPer proseguire \xE8 necessario salvare una copia del file."
#: Merge.rc:2177
#, c-format
@@ -3979,24 +3987,24 @@
#: Merge.rc:2201
#, c-format
msgid "Break at whitespace"
-msgstr "Interrompi agli spazi bianchi"
+msgstr "Interrompi agli spazi vuoti"
#: Merge.rc:2202
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Interrompi agli spazi bianchi o punteggiatura"
+msgstr "Interrompi agli spazi vuoti o di punteggiatura"
#: Merge.rc:2208
#: Merge.rc:2210
#, c-format
msgid "Copy selected item to named directory"
-msgstr "Copia elemento selezionato in una cartella specifica"
+msgstr "Copia l'elemento selezionato in una cartella specifica"
#: Merge.rc:2209
#: Merge.rc:2211
#, c-format
msgid "Copy selected item to custom directory"
-msgstr "Copia elemento selezionato in una cartella personalizzata"
+msgstr "Copia l'elemento selezionato in una cartella personalizzata"
#: Merge.rc:2212
#, c-format
@@ -4016,7 +4024,7 @@
#: Merge.rc:2215
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
-msgstr "Nascondi gli elementi selezionati (filtro al volo)"
+msgstr "Nasconde l'elemento o gli elementi selezionati (filtro rapido)"
#: Merge.rc:2216
#, c-format
@@ -4026,22 +4034,22 @@
#: Merge.rc:2217
#, c-format
msgid "Right to Left (%1)"
-msgstr "Da Destra a Sinistra (%1)"
+msgstr "Da destra verso sinistra (%1)"
#: Merge.rc:2218
#, c-format
msgid "Left to Right (%1)"
-msgstr "Da Sinistra a Destra (%1)"
+msgstr "Da sinistra verso destra (%1)"
#: Merge.rc:2219
#, c-format
msgid "Right to Left (%1 of %2)"
-msgstr "Da Destra a Sinistra (%1 su %2)"
+msgstr "Da destra verso sinistra (%1 di %2)"
#: Merge.rc:2220
#, c-format
msgid "Left to Right (%1 of %2)"
-msgstr "Da Sinistra a Destra (%1 su %2)"
+msgstr "Da sinistra verso destra (%1 di %2)"
#: Merge.rc:2221
#: Merge.rc:2237
@@ -4059,13 +4067,13 @@
#: Merge.rc:2239
#, c-format
msgid "Left to... (%1 of %2)"
-msgstr "Sinistra in... (%1 su %2)"
+msgstr "Sinistra in... (%1 di %2)"
#: Merge.rc:2224
#: Merge.rc:2240
#, c-format
msgid "Right to... (%1 of %2)"
-msgstr "Destra in... (%1 su %2)"
+msgstr "Destra in... (%1 di %2)"
#: Merge.rc:2230
#, c-format
@@ -4085,17 +4093,17 @@
#: Merge.rc:2233
#, c-format
msgid "Left (%1 of %2)"
-msgstr "Sinistra (%1 su %2)"
+msgstr "Sinistra (%1 di %2)"
#: Merge.rc:2234
#, c-format
msgid "Right (%1 of %2)"
-msgstr "Destra (%1 su %2)"
+msgstr "Destra (%1 di %2)"
#: Merge.rc:2235
#, c-format
msgid "Both (%1 of %2)"
-msgstr "Entrambi (%1 su %2)"
+msgstr "Entrambi (%1 di %2)"
#: Merge.rc:2236
#, c-format
@@ -4115,12 +4123,12 @@
#: Merge.rc:2243
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 file coinvolti)"
+msgstr "(%1 file applicati)"
#: Merge.rc:2244
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 file su %2 coinvolti)"
+msgstr "(%1 file di %2 applicati)"
#: Merge.rc:2250
#, c-format
@@ -4165,22 +4173,22 @@
#: Merge.rc:2254
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Sei sicuro di voler spostare:"
#: Merge.rc:2255
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Sei sicuro di voler spostare %d elementi"
#: Merge.rc:2257
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Conferma spostamento"
#: Merge.rc:2263
#, c-format
msgid "Open left file"
-msgstr "Apre il file di sinistra"
+msgstr "Apre il file di sinistra con l'applicazione predefinita"
#: Merge.rc:2264
#, c-format
@@ -4190,12 +4198,12 @@
#: Merge.rc:2265
#, c-format
msgid "Open left file with ..."
-msgstr "Apre il file di sinistra con..."
+msgstr "Permette di indicare un programma con cui aprire il file di sinistra"
#: Merge.rc:2266
#, c-format
msgid "Open right file"
-msgstr "Apre il file di destra"
+msgstr "Apre il file di destra con l'applicazione predefinita"
#: Merge.rc:2267
#, c-format
@@ -4205,7 +4213,7 @@
#: Merge.rc:2268
#, c-format
msgid "Open right file with..."
-msgstr "Apre il file di destra con..."
+msgstr "Permette di indicare un programma con cui aprire il file di destra"
#: Merge.rc:2269
#, c-format
@@ -4240,12 +4248,12 @@
#: Merge.rc:2280
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Men\xF9 Shell sinistro"
#: Merge.rc:2281
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Men\xF9 Shell destro"
#: Merge.rc:2287
#, c-format
@@ -4370,22 +4378,22 @@
#: Merge.rc:2324
#, c-format
msgid "Left EOL"
-msgstr "EOL di sinistra"
+msgstr "Fine riga (EOL) di sinistra"
#: Merge.rc:2325
#, c-format
msgid "Right EOL"
-msgstr "EOL di destra"
+msgstr "Fine riga (EOL) di destra"
#: Merge.rc:2331
#, c-format
msgid "Left Encoding"
-msgstr "Codifica di sinistra"
+msgstr "Codifica sinistra"
#: Merge.rc:2332
#, c-format
msgid "Right Encoding"
-msgstr "Codifica di destra"
+msgstr "Codifica destra"
#: Merge.rc:2333
#, c-format
@@ -4446,7 +4454,7 @@
#: Merge.rc:2351
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Le cartelle sono diverse"
#: Merge.rc:2352
#, c-format
@@ -4466,12 +4474,12 @@
#: Merge.rc:2356
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "I file di testo sono uguali"
#: Merge.rc:2361
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "I file di testo sono diversi"
#: Merge.rc:2367
#, c-format
@@ -4581,12 +4589,12 @@
#: Merge.rc:2398
#, c-format
msgid "Left side file EOL type"
-msgstr "Tipo di fine linea nel file di sinistra"
+msgstr "Tipo di EOL (fine riga) file di sinistra"
#: Merge.rc:2399
#, c-format
msgid "Right side file EOL type"
-msgstr "Tipo di fine linea nel file di destra"
+msgstr "Tipo di EOL (fine riga) file di destra"
#: Merge.rc:2405
#, c-format
@@ -4686,11 +4694,11 @@
"\n"
"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 ""
-"Questi file usano tipi diversi di carriage return.\n"
+"Questi file usano tipi diversi di ritorno a capo.\n"
"\n"
-"Desideri trattarli tutti come se fossero equivalenti in questo confronto?\n"
+"In questo confronto desideri trattarli tutti come se fossero equivalenti?\n"
"\n"
-"Nota: Se vuoi sempre trattare tutti i tipi di carriage return come equivalenti, imposta l'opzione 'Ignora le differenze di carriage return' nella linguetta Confronto delle Opzioni (raggiungibile dal menu Modifica->Opzioni)."
+"Nota: Se vuoi sempre trattare tutti i tipi di ritorno a capo come equivalenti, imposta l'opzione\n'Ignora le differenze di ritorno a capo' nella scheda Comparazione della finestra delle Opzioni\n(raggiungibile dal menu Modifica/Opzioni)."
#: Merge.rc:2434
#, c-format
@@ -4772,7 +4780,7 @@
#: Merge.rc:2455
#, c-format
msgid "Line difference"
-msgstr "Differenza della linea"
+msgstr "Differenza della riga"
#: Merge.rc:2461
#, c-format
@@ -4797,12 +4805,12 @@
#: Merge.rc:2475
#, c-format
msgid "Location Pane"
-msgstr "Pannello della locazione"
+msgstr "Posizione"
#: Merge.rc:2476
#, c-format
msgid "Diff Pane"
-msgstr "Pannello delle differenze"
+msgstr "Differenze"
#: Merge.rc:2482
#, c-format
@@ -4897,9 +4905,9 @@
"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
"See manual for more info about archive support and how to enable it."
msgstr ""
-"Il supporto per gli archivi non \xE8 attivo.\n"
-"Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto sono stati trovati.\n"
-"Guarda il manuale per ulteriori informazioni sugli archivi e come attivare il supporto per essi."
+"Il supporto per i file compressi non \xE8 attivo.\n"
+"Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto dei file compressi \xE8 stato trovato.\n"
+"Guarda il manuale per ulteriori informazioni sugli archivi compressi e come attivare il relativo supporto."
#: Merge.rc:2503
#, c-format
@@ -5063,22 +5071,22 @@
#: Merge.rc:2546
#, c-format
msgid "Mixed"
-msgstr "Mescolato"
+msgstr "Misto"
#: Merge.rc:2548
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2549
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2550
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2557
#, c-format
@@ -5113,22 +5121,22 @@
#: Merge.rc:2568
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Tipo"
#: Merge.rc:2570
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "Scompattatore"
#: Merge.rc:2571
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "Prediffer"
#: Merge.rc:2572
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Script Editor"
#: Merge.rc:2579
#, c-format
@@ -5153,32 +5161,32 @@
#: Merge.rc:2583
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Modifica file sinistro/stato cartella di sola lettura"
#: Merge.rc:2584
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Modifica file destro/stato cartella di sola lettura"
#: Merge.rc:2585
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr "Converte EOL nella modalit\xE0 Windows"
+msgstr "Converte fine riga (EOL) nella modalit\xE0 Windows"
#: Merge.rc:2586
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr "Converte EOL nella modalit\xE0 Unix"
+msgstr "Converte fine riga (EOL) nella modalit\xE0 Unix"
#: Merge.rc:2587
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr "Converte EOL nella modalit\xE0 Mac"
+msgstr "Converte fine riga (EOL) nella modalit\xE0 Mac"
#: Merge.rc:2588
#, c-format
msgid "Switch between editing and merging modes"
-msgstr "Passa dalla modalit\xE0 di editing a quella di 'Unione', in cui l'integrazione delle differenze\xE8 pi\xF9 rapida"
+msgstr "Passa dalla modalit\xE0 di editing a quella di 'Unione', in cui l'integrazione delle differenze \xE8 pi\xF9 rapida"
#: Merge.rc:2589
#, c-format
@@ -5192,7 +5200,7 @@
#: Merge.rc:2590
#, c-format
msgid "Open and resolve conflict file"
-msgstr ""
+msgstr "Apre e risolve i conflitti dei file"
#: Merge.rc:2596
#, c-format
@@ -5200,8 +5208,8 @@
"Select difference area in the current line\n"
"Difference in the Current Line"
msgstr ""
-"Seleziona l'area della differenza nella linea corrente\n"
-"Differenza nella linea corrente"
+"Seleziona l'area della differenza nella riga corrente\n"
+"Differenza nella riga corrente"
#: Merge.rc:2597
#, c-format
@@ -5209,7 +5217,7 @@
"Go to line or difference\n"
"Go to (Ctrl+G)"
msgstr ""
-"Vai a una linea o una differenza\n"
+"Permette di spostarsi su una riga o una differenza specifiche\n"
"Vai a (Ctrl+G)"
#: Merge.rc:2598
@@ -5233,7 +5241,7 @@
#: Merge.rc:2600
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
-msgstr "Copia le linee selezionate negli Appunti aggiungendo i numeri di linea all'inizio"
+msgstr "Copia le righe selezionate negli Appunti aggiungendo i numeri di linea all'inizio"
#: Merge.rc:2601
#, c-format
@@ -5248,12 +5256,12 @@
#: Merge.rc:2603
#, c-format
msgid "Go to next bookmark"
-msgstr "Va al segnalibro successivo"
+msgstr "Passa al segnalibro successivo"
#: Merge.rc:2604
#, c-format
msgid "Go to previous bookmark"
-msgstr "Va al segnalibro precedente"
+msgstr "Passa al segnalibro precedente"
#: Merge.rc:2605
#, c-format
@@ -5335,17 +5343,17 @@
#: Merge.rc:2624
#, c-format
msgid "Shows whitespace characters"
-msgstr "Mostra gli spazi bianchi"
+msgstr "Mostra caratteri di spaziatura"
#: Merge.rc:2625
#, c-format
msgid "Toggle Diff Pane"
-msgstr "Mostra il pannello delle differenze"
+msgstr "Mostra il riquadro delle differenze"
#: Merge.rc:2626
#, c-format
msgid "Location pane shows overall picture from files"
-msgstr "Il pannello della locazione mostra un'immagine complessiva dei file"
+msgstr "Il riquadro della posizione mostra un'immagine complessiva dei file"
#: Merge.rc:2627
#, c-format
@@ -5390,8 +5398,8 @@
"Enable word wrap\n"
"Wrap Lines"
msgstr ""
-"Vai a capo automaticamente\n"
-"Va a capo automaticamente (word wrap)"
+"Abilita la funzione di a capo automatico\n"
+"Righe di a capo"
#: Merge.rc:2633
#, c-format
@@ -5410,7 +5418,7 @@
#: Merge.rc:2635
#, c-format
msgid "Decrease text size"
-msgstr "Riduci la dimensione del testo"
+msgstr "Riduce la dimensione del testo"
#: Merge.rc:2636
#, c-format
@@ -5423,7 +5431,7 @@
"Scroll to the previous difference\n"
"Previous Difference (Alt+Up)"
msgstr ""
-"Scorri alla differenza precedente\n"
+"Passa alla differenza precedente\n"
"Differenza precedente (Alt+Su)"
#: Merge.rc:2643
@@ -5432,7 +5440,7 @@
"Scroll to the next difference\n"
"Next Difference (Alt+Down)"
msgstr ""
-"Scorri alla differenza successiva\n"
+"Passa alla differenza successiva\n"
"Differenza successiva(Alt+Gi\xF9)"
#: Merge.rc:2644
@@ -5441,7 +5449,7 @@
"Scroll to the first difference\n"
"First Difference (Alt+Home)"
msgstr ""
-"Scorri alla prima differenza\n"
+"Passa alla prima differenza\n"
"Prima differenza (Alt+Home)"
#: Merge.rc:2645
@@ -5459,7 +5467,7 @@
"Scroll to the last difference\n"
"Last Difference (Alt+End)"
msgstr ""
-"Scorri all'ultima differenza\n"
+"Passa all'ultima differenza\n"
"Ultima differenza (Alt+Fine)"
#: Merge.rc:2647
@@ -5486,7 +5494,7 @@
"Copy difference to right and advance to next\n"
"Copy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-"Copia la differenza a destra e avanza alla prossima\n"
+"Copia la differenza a destra e passa alla successiva discrepanza\n"
"Copia a destra e avanza (Ctrl+Alt+Destra)"
#: Merge.rc:2650
@@ -5495,7 +5503,7 @@
"Copy difference to left and advance to next\n"
"Copy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-"Copia la differenza a sinistra e avanza alla prossima\n"
+"Copia la differenza a sinistra e passa alla successiva discrepanza\n"
"Copia a sinistra e avanza (Ctrl+Alt+Sinistra)"
#: Merge.rc:2651
@@ -5524,7 +5532,7 @@
#: Merge.rc:2654
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
-msgstr "Confronta l'elemento selezionato (confronta il primo elemento se ne sono stati selezionati pi\xF9 di uno)"
+msgstr "Confronta l'elemento selezionato (raffronta il primo elemento se ne sono stati selezionati pi\xF9 di uno)"
#: Merge.rc:2660
#, c-format
@@ -5549,7 +5557,7 @@
#: Merge.rc:2669
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Visualizza lista dei plugin disponibili"
#: Merge.rc:2670
#, c-format
@@ -5559,7 +5567,7 @@
#: Merge.rc:2671
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Lo scompattatore adatto \xE8 applicato a entrambi i file (\xE8 sufficiente che uno dei file abbia l'estensione)"
+msgstr "Lo scompattatore adatto \xE8 applicato a entrambi i file (\xE8 sufficiente che solo uno dei file abbia l'estensione)"
#: Merge.rc:2672
#, c-format
@@ -5569,7 +5577,7 @@
#: Merge.rc:2673
#, c-format
msgid "No prediffer (normal)"
-msgstr "No prediffer (normale)"
+msgstr "Senza prediffer (normale)"
#: Merge.rc:2674
#, c-format
@@ -5592,8 +5600,8 @@
"Activates next visible file\n"
"Activate next File"
msgstr ""
-"Attiva il prossimo file visibile\n"
-"Attiva prossimo file"
+"Attiva il successivo file visibile\n"
+"Attiva file successivo"
#: Merge.rc:2683
#, c-format
@@ -5606,13 +5614,13 @@
"Opens the WinMerge Help\n"
"WinMerge Help"
msgstr ""
-"Apri la Guida di WinMerge\n"
-"Guida WinMerge"
+"Apre la guida di WinMerge\n"
+"Guida di WinMerge"
#: Merge.rc:2690
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
-msgstr "Invia le informazioni sulla versione e la configurazione corrente di WinMerge a un file di testo"
+msgstr "Visualizza un file di testo con le informazioni sulla versione e la configurazione attuale di WinMerge"
#: Merge.rc:2691
#, c-format
@@ -5630,7 +5638,7 @@
"Opens the release notes document\n"
"Release Notes"
msgstr ""
-"Apri il documento delle note di rilascio\n"
+"Apre il documento delle note di rilascio\n"
"Note di rilascio"
#: Merge.rc:2694
@@ -5639,7 +5647,7 @@
"Opens the translations website\n"
"Translations"
msgstr ""
-"Apri il sito per le traduzioni\n"
+"Apre la pagina web delle traduzioni\n"
"Traduzioni"
#: Merge.rc:2700
@@ -5675,17 +5683,17 @@
#: Merge.rc:2712
#, c-format
msgid "Open the file with registered application"
-msgstr "Apri il file con l'applicazione registrata per esso"
+msgstr "Apre il file con l'applicazione predefinita"
#: Merge.rc:2713
#, c-format
msgid "Open the file with external editor"
-msgstr "Apri il file con l'editor esterno"
+msgstr "Apre il file con l'editor esterno"
#: Merge.rc:2714
#, c-format
msgid "Open the file with a particular program"
-msgstr "Apri il file con un programma specifico"
+msgstr "Permette di indicare un programma con cui aprire il file"
#: Merge.rc:2720
#, c-format
@@ -5710,12 +5718,12 @@
#: Merge.rc:2724
#, c-format
msgid "G&oto Diff %1 of %2"
-msgstr "Vai alla &differenza %1 su %2"
+msgstr "Vai alla &differenza %1 di %2"
#: Merge.rc:2725
#, c-format
msgid "G&oto Line %1"
-msgstr "Vai alla &linea %1"
+msgstr "Vai alla &riga %1"
#: Merge.rc:2731
#, c-format
@@ -5735,7 +5743,7 @@
#: Merge.rc:2739
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Non evidenziare"
#: Merge.rc:2740
#, c-format
@@ -5830,12 +5838,12 @@
#: Merge.rc:2758
#, c-format
msgid "Portable Object"
-msgstr "Oggetto portabile"
+msgstr "Portable Object"
#: Merge.rc:2759
#, c-format
msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
#: Merge.rc:2760
#, c-format
@@ -5850,7 +5858,7 @@
#: Merge.rc:2762
#, c-format
msgid "Resources"
-msgstr "Risorse"
+msgstr "Resources"
#: Merge.rc:2763
#, c-format
@@ -5890,7 +5898,7 @@
#: Merge.rc:2770
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2771
#, c-format
@@ -5900,7 +5908,7 @@
#: Merge.rc:2776
#, c-format
msgid "Hide the toolbar"
-msgstr "Nascondi la barra degli strumenti"
+msgstr "Nasconde la barra degli strumenti"
#: Merge.rc:2777
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-11 02:37:59
|
Revision: 7609
http://sourceforge.net/p/winmerge/code/7609
Author: christianlist
Date: 2013-03-11 02:37:57 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
[patches:#3028] Winmerge 2.14.0 Italian Translation Update
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/Languages/Italian.po
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-10 14:55:03 UTC (rev 7608)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-11 02:37:57 UTC (rev 7609)
@@ -9,6 +9,7 @@
Translation updates:
- Basque (patches:#3024)
- Spanish (patches:#3027)
+ - Italian (patches:#3028)
WinMerge 2.14.0 - 2013-02-02 (r7596)
Bugfix: Shell extension uses unquoted program path (patches:#3023)
Modified: branches/R2_14/Src/Languages/Italian.po
===================================================================
--- branches/R2_14/Src/Languages/Italian.po 2013-03-10 14:55:03 UTC (rev 7608)
+++ branches/R2_14/Src/Languages/Italian.po 2013-03-11 02:37:57 UTC (rev 7609)
@@ -5,6 +5,7 @@
# * Michele Merega <michele.merega at ifminfomaster.com>
# * Andrea Decorte <deco1985 at hotmail.com>
# * Antonio Angelo <antonio.angelo at gmail.com>
+# * Luca Gori <grojunk at gmail.com>
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -13,9 +14,9 @@
"Project-Id-Version: Italian\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: 2008-03-04 18:02+0000\n"
-"PO-Revision-Date: 2008-04-10 11:13+0100\n"
-"Last-Translator: Antonio Angelo <antonio.angelo at gmail.com>\n"
-"Language-Team: Italian\n"
+"PO-Revision-Date: 2013-02-10 11:13+0100\n"
+"Last-Translator: Luca Gori <grojunk at gmail.com>\n"
+"Language-Team: Italian <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=windows-1252\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -75,7 +76,7 @@
#: Merge.rc:512
#, c-format
msgid "&Copy"
-msgstr "C&opia"
+msgstr "C&opia..."
#: Merge.rc:82
#: Merge.rc:104
@@ -92,28 +93,28 @@
#: Merge.rc:86
#, c-format
msgid "Op&en"
-msgstr "&Apri"
+msgstr "&Apri con..."
#: Merge.rc:88
#: Merge.rc:535
#: Merge.rc:541
#, c-format
msgid "with &Registered Application"
-msgstr "con l'applicazione ®istrata"
+msgstr "&Applicazione registrata"
#: Merge.rc:89
#: Merge.rc:536
#: Merge.rc:542
#, c-format
msgid "with &External Editor"
-msgstr "con l'editor &esterno"
+msgstr "&Editor esterno"
#: Merge.rc:90
#: Merge.rc:537
#: Merge.rc:543
#, c-format
msgid "&with..."
-msgstr "&con..."
+msgstr "&Scegli programma..."
#: Merge.rc:110
#: Merge.rc:194
@@ -286,17 +287,17 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Elenco..."
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "Prediffer ma&nuale"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "Prediffer A&utomatico"
#: Merge.rc:155
#: Merge.rc:276
@@ -409,7 +410,7 @@
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "Guida &WinMerge\tF1"
+msgstr "Guida di &WinMerge\tF1"
#: Merge.rc:182
#: Merge.rc:303
@@ -423,7 +424,7 @@
#: Merge.rc:492
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "&Traduzioni"
#: Merge.rc:184
#: Merge.rc:305
@@ -444,7 +445,7 @@
#: Merge.rc:496
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "&GNU General Public License"
#: Merge.rc:188
#: Merge.rc:309
@@ -457,13 +458,13 @@
#: Merge.rc:340
#, c-format
msgid "L&eft Read-only"
-msgstr "Fil&e di sinistra di Sola lettura"
+msgstr "Fil&e del riquadro di sinistra di Sola lettura"
#: Merge.rc:204
#: Merge.rc:341
#, c-format
msgid "Ri&ght Read-only"
-msgstr "F&ile di destra di Sola lettura"
+msgstr "F&ile del riquadro di destra di Sola lettura"
#: Merge.rc:206
#, c-format
@@ -514,17 +515,17 @@
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Modalit\xE0 struttura"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "E&spandi tutte le sottocartelle"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Comprimi tutte le sottocartelle"
#: Merge.rc:242
#, c-format
@@ -620,7 +621,7 @@
#: Merge.rc:325
#, c-format
msgid "Save &Left"
-msgstr "Sa&lva sinistro"
+msgstr "Sa&lva riquadro sinistro"
#: Merge.rc:327
#: Merge.rc:332
@@ -632,12 +633,12 @@
#: Merge.rc:333
#, c-format
msgid "Save &As..."
-msgstr "S&alva con nome..."
+msgstr "S&alva come..."
#: Merge.rc:330
#, c-format
msgid "Save &Right"
-msgstr "Salva dest&ro"
+msgstr "Salva riquadro dest&ro"
#: Merge.rc:336
#, c-format
@@ -657,27 +658,27 @@
#: Merge.rc:343
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&Converti caratteri di fine linea a"
+msgstr "&Converti caratteri di fine riga in..."
#: Merge.rc:345
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:346
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:347
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:350
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "&Modalit\xE0 'Unione'\tF9"
+msgstr "&Modalit\xE0 Unione\tF9"
#: Merge.rc:352
#, c-format
@@ -738,7 +739,7 @@
#: Merge.rc:376
#, c-format
msgid "Advanced"
-msgstr "Avanzat&e"
+msgstr "Avanzate"
#: Merge.rc:378
#, c-format
@@ -778,7 +779,7 @@
#: Merge.rc:396
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "&Zoom"
#: Merge.rc:398
#, c-format
@@ -809,12 +810,12 @@
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "&Visualizza spazi bianchi"
+msgstr "&Visualizza spazi vuoti"
#: Merge.rc:409
#, c-format
msgid "Vie&w Line Differences"
-msgstr "Visualizza &differenze nelle linee"
+msgstr "Visualizza &differenze nelle righe"
#: Merge.rc:410
#, c-format
@@ -839,12 +840,12 @@
#: Merge.rc:424
#, c-format
msgid "Diff &Pane"
-msgstr "&Pannello delle differenze"
+msgstr "&Riquadro delle differenze"
#: Merge.rc:425
#, c-format
msgid "Lo&cation Pane"
-msgstr "Pannello della loca&zione"
+msgstr "Riquadro della posi&zione"
#: Merge.rc:443
#, c-format
@@ -879,22 +880,22 @@
#: Merge.rc:506
#, c-format
msgid "Co&mpare As"
-msgstr ""
+msgstr "Co&nfronta come..."
#: Merge.rc:508
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:509
#, c-format
msgid "&Binary"
-msgstr ""
+msgstr "&Binario"
#: Merge.rc:514
#, c-format
msgid "&Left to Right"
-msgstr "Da &Sinistra a Destra"
+msgstr "da &Sinistra verso Destra"
#: Merge.rc:515
#, c-format
@@ -904,7 +905,7 @@
#: Merge.rc:516
#, c-format
msgid "&Right to Left"
-msgstr "Da &Destra a Sinistra"
+msgstr "da &Destra verso Sinistra"
#: Merge.rc:517
#, c-format
@@ -936,14 +937,14 @@
#: Merge.rc:1501
#, c-format
msgid "&Left"
-msgstr "&Sinistra"
+msgstr "&Sinistro"
#: Merge.rc:527
#: Merge.rc:1138
#: Merge.rc:1504
#, c-format
msgid "&Right"
-msgstr "&Destra"
+msgstr "&Destro"
#: Merge.rc:528
#, c-format
@@ -963,12 +964,12 @@
#: Merge.rc:533
#, c-format
msgid "&Open Left"
-msgstr "Apri &file di sinistra"
+msgstr "Apri &file di sinistra con..."
#: Merge.rc:539
#, c-format
msgid "O&pen Right"
-msgstr "A&pri file di destra"
+msgstr "A&pri file di destra con..."
#: Merge.rc:546
#, c-format
@@ -978,17 +979,17 @@
#: Merge.rc:548
#, c-format
msgid "&Left (%1 of %2)"
-msgstr "&Sinistra (%1 su %2)"
+msgstr "&Sinistra (%1 di %2)"
#: Merge.rc:549
#, c-format
msgid "&Right (%1 of %2)"
-msgstr "&Destra (%1 su %2)"
+msgstr "&Destra (%1 di %2)"
#: Merge.rc:550
#, c-format
msgid "&Both (%1 of %2)"
-msgstr "&Entrambi (%1 su %2)"
+msgstr "&Entrambi (%1 di %2)"
#: Merge.rc:552
#, c-format
@@ -998,27 +999,27 @@
#: Merge.rc:554
#, c-format
msgid "&Zip"
-msgstr "&Zippa"
+msgstr "Comprimi (&Zip)"
#: Merge.rc:556
#, c-format
msgid "&Left... (%1 of %2)"
-msgstr "&Sinistra... (%1 su %2)"
+msgstr "&Sinistra... (%1 di %2)"
#: Merge.rc:557
#, c-format
msgid "&Right... (%1 of %2)"
-msgstr "&Destra... (%1 su %2)"
+msgstr "&Destra... (%1 di %2)"
#: Merge.rc:558
#, c-format
msgid "&Both... (%1 of %2)"
-msgstr "&Entrambi... (%1 su %2)"
+msgstr "&Entrambi... (%1 di %2)"
#: Merge.rc:559
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr "Di&fferenze... (%1 su %2)"
+msgstr "Di&fferenze... (%1 di %2)"
#: Merge.rc:562
#, c-format
@@ -1043,7 +1044,7 @@
#: Merge.rc:583
#, c-format
msgid "&No prediffer"
-msgstr "&No prediffer"
+msgstr "&Senza prediffer"
#: Merge.rc:584
#, c-format
@@ -1115,7 +1116,7 @@
#: Merge.rc:685
#, c-format
msgid "Select Files or Folders"
-msgstr "Seleziona i file o le cartelle"
+msgstr "Seleziona file o cartelle"
#: Merge.rc:688
#: Merge.rc:1578
@@ -1204,7 +1205,7 @@
#: Merge.rc:712
#, c-format
msgid "Files or Folders to Compare"
-msgstr "File o cartelle da confrontare"
+msgstr "File o cartelle da confrontare:"
#: Merge.rc:719
#, c-format
@@ -1289,12 +1290,12 @@
#: Merge.rc:766
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "C&hiudi finestra con ESC"
+msgstr "C&hiudi le finestre con il tasto ESC"
#: Merge.rc:768
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "Verifica &automaticamente i percorsi nella finestra Apri"
+msgstr "Verifica &automaticamente i percorsi nella finestra \"Apri...\""
#: Merge.rc:771
#, c-format
@@ -1304,17 +1305,17 @@
#: Merge.rc:773
#, c-format
msgid "As&k when closing multiple windows"
-msgstr "Domanda alla c&hiusura di pi\xF9 finestre"
+msgstr "Visualizza conferma alla c&hiusura di pi\xF9 finestre"
#: Merge.rc:775
#, c-format
msgid "&Preserve file time in file compare"
-msgstr "&Preserva orario del file durante il confronto"
+msgstr "Mantieni l'ora del file durante il confronto"
#: Merge.rc:778
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "All'avvio mostra la finesta di dialogo \"Seleziona file o cartelle\""
#: Merge.rc:780
#, c-format
@@ -1324,24 +1325,24 @@
#: Merge.rc:783
#, c-format
msgid "Enable multiple compare windows for"
-msgstr "Attiva finestra di confronto multiplo per"
+msgstr "Abilita finestre di confronto multiplo per:"
#: Merge.rc:785
#: Merge.rc:1601
#, c-format
msgid "&Folder compare"
-msgstr "Confron&to di cartelle"
+msgstr "Comparazione delle &cartelle"
#: Merge.rc:787
#: Merge.rc:1603
#, c-format
msgid "Fil&e compare"
-msgstr "Confronto di &file"
+msgstr "Comparazione dei &file"
#: Merge.rc:789
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante Ripristina per rendere di nuovo visibili tutti i messaggi."
+msgstr "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante \"Ripristina\" per rendere di nuovo visibili tutti i messaggi."
#: Merge.rc:791
#, c-format
@@ -1379,7 +1380,7 @@
#: Merge.rc:849
#, c-format
msgid "Match &case"
-msgstr "&Maiuscolo/Minuscolo"
+msgstr "&Maiuscole/minuscole"
#: Merge.rc:821
#: Merge.rc:851
@@ -1411,7 +1412,7 @@
#: Merge.rc:861
#, c-format
msgid "&Find Next"
-msgstr "&Trova succ."
+msgstr "&Successivo"
#: Merge.rc:838
#, c-format
@@ -1431,17 +1432,17 @@
#: Merge.rc:856
#, c-format
msgid "Replace in"
-msgstr "Sostituisci in"
+msgstr "Sostituisci:"
#: Merge.rc:857
#, c-format
msgid "&Selection"
-msgstr "Sele&zione"
+msgstr "Nella sele&zione"
#: Merge.rc:859
#, c-format
msgid "Wh&ole file"
-msgstr "T&utto il file"
+msgstr "In t&utto il file"
#: Merge.rc:862
#, c-format
@@ -1468,7 +1469,7 @@
#: Merge.rc:1164
#, c-format
msgid "Comments"
-msgstr "Commenti"
+msgstr "Commenti:"
#: Merge.rc:881
#, c-format
@@ -1478,12 +1479,12 @@
#: Merge.rc:887
#, c-format
msgid "Linefilters"
-msgstr "Filtri di linee"
+msgstr "Filtri per le righe"
#: Merge.rc:890
#, c-format
msgid "Enable Line Filters"
-msgstr "Attiva i filtri di linee"
+msgstr "Attiva filtri per le righe"
#: Merge.rc:893
#, c-format
@@ -1548,22 +1549,22 @@
#: Merge.rc:944
#, c-format
msgid "Moved:"
-msgstr "Spostata:"
+msgstr "Spostamento:"
#: Merge.rc:954
#, c-format
msgid "Selected Moved:"
-msgstr "Spostata selezionata:"
+msgstr "Spostamento selezione:"
#: Merge.rc:961
#, c-format
msgid "Word Difference:"
-msgstr "Differenza di parole:"
+msgstr "Differenza parole:"
#: Merge.rc:968
#, c-format
msgid "Selected Word Diff:"
-msgstr "Diff. parole selezionata:"
+msgstr "Parola selezionata diff.:"
#: Merge.rc:975
#: Merge.rc:1054
@@ -1591,7 +1592,7 @@
#: Merge.rc:994
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr "&Posiziona i file eliminati nel cestino"
+msgstr "&Sposta i file cancellati nel cestino"
#: Merge.rc:996
#, c-format
@@ -1611,17 +1612,17 @@
#: Merge.rc:1002
#, c-format
msgid "Temporary files folder"
-msgstr "Cartella file temporanei"
+msgstr "Cartella dei file temporanei:"
#: Merge.rc:1003
#, c-format
msgid "S&ystem's temp folder"
-msgstr "Cartella temporanea di s&istema"
+msgstr "Cartella dei file temporanei del s&istema"
#: Merge.rc:1005
#, c-format
msgid "C&ustom folder:"
-msgstr "Cartella &utente:"
+msgstr "Cartella personalizzata:"
#: Merge.rc:1008
#: Merge.rc:1024
@@ -1737,17 +1738,17 @@
#: Merge.rc:1096
#, c-format
msgid "File unpacker:"
-msgstr "Scompattatore di file:"
+msgstr "Scompattatore:"
#: Merge.rc:1099
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr "Visualizza tutti gli scompattatori, non verificare l'estensione"
+msgstr "Visualizza tutti gli scompattatori (non verificare estensione)"
#: Merge.rc:1102
#, c-format
msgid "Extensions list:"
-msgstr "Lista delle estensioni:"
+msgstr "Elenco estensioni:"
#: Merge.rc:1103
#, c-format
@@ -1783,12 +1784,12 @@
#: Merge.rc:1130
#, c-format
msgid "Go To"
-msgstr "Vai a"
+msgstr "Vai a..."
#: Merge.rc:1133
#, c-format
msgid "G&oto:"
-msgstr "Va&i a:"
+msgstr "Punto:"
#: Merge.rc:1135
#, c-format
@@ -1798,12 +1799,12 @@
#: Merge.rc:1140
#, c-format
msgid "Goto what"
-msgstr "Vai a ..."
+msgstr "Posizionamento:"
#: Merge.rc:1141
#, c-format
msgid "Li&ne"
-msgstr "Li&nea"
+msgstr "Ri&ga"
#: Merge.rc:1143
#, c-format
@@ -1819,12 +1820,12 @@
#: Merge.rc:1942
#, c-format
msgid "Compare"
-msgstr "Confronto"
+msgstr "Comparazione"
#: Merge.rc:1154
#, c-format
msgid "Whitespace"
-msgstr "Spazi bianchi"
+msgstr "Spazi vuoti:"
#: Merge.rc:1155
#, c-format
@@ -1844,17 +1845,17 @@
#: Merge.rc:1158
#, c-format
msgid "Ignore blan&k lines"
-msgstr "Ign&ora le linee vuote"
+msgstr "Ign&ora le righe vuote"
#: Merge.rc:1159
#, c-format
msgid "Ignore &case"
-msgstr "Ig&nora le differenze tra maiuscole e minuscole"
+msgstr "Ig&nora le differenze tra MAIUSCOLE e minuscole"
#: Merge.rc:1160
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "I&gnora differenze nei fine riga (Windows/Unix/Mac)"
+msgstr "I&gnora differenze di ritorno a capo (Windows/Unix/Mac)"
#: Merge.rc:1162
#, c-format
@@ -1864,7 +1865,7 @@
#: Merge.rc:1163
#, c-format
msgid "&Match similar lines"
-msgstr "&Metti in corrispondenza linee simili"
+msgstr "&Metti in corrispondenza righe simili"
#: Merge.rc:1165
#, c-format
@@ -1885,12 +1886,12 @@
#: Merge.rc:1176
#, c-format
msgid "&Automatic rescan"
-msgstr "Riscansiona &automaticamente"
+msgstr "Ripeti scansione &automaticamente"
#: Merge.rc:1178
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "&Conserva i caratteri originali di fine riga"
+msgstr "&Mantieni caratteri EOL (fine riga) originali"
#: Merge.rc:1180
#, c-format
@@ -1900,7 +1901,7 @@
#: Merge.rc:1181
#, c-format
msgid "&Tab size:"
-msgstr "&Dimensioni:"
+msgstr "&Formato:"
#: Merge.rc:1184
#, c-format
@@ -1910,32 +1911,32 @@
#: Merge.rc:1186
#, c-format
msgid "Insert &Spaces"
-msgstr "In&serisci spazi"
+msgstr "In&serisci spazio"
#: Merge.rc:1188
#, c-format
msgid "Line Difference Coloring"
-msgstr "Colorazione delle differenze di linea"
+msgstr "Colorazione differenza riga"
#: Merge.rc:1190
#, c-format
msgid "View line differences"
-msgstr "Mostra differenze di linea"
+msgstr "Mostra differenze di riga"
#: Merge.rc:1192
#, c-format
msgid "&Character level"
-msgstr "Livello &caratteri"
+msgstr "a livello di &caratteri"
#: Merge.rc:1194
#, c-format
msgid "&Word-level:"
-msgstr "Livello &parole:"
+msgstr "a livello di &parole:"
#: Merge.rc:1209
#, c-format
msgid "Filefilters"
-msgstr "Filtri di file"
+msgstr "Filtri per i file"
#: Merge.rc:1215
#, c-format
@@ -1970,7 +1971,7 @@
#: Merge.rc:1228
#, c-format
msgid "Left side file"
-msgstr "File sul lato sinistro"
+msgstr "File lato sinistro"
#: Merge.rc:1231
#, c-format
@@ -1980,12 +1981,12 @@
#: Merge.rc:1233
#, c-format
msgid "&Discard changes"
-msgstr "S&carta le modifiche"
+msgstr "Ignora le modifiche"
#: Merge.rc:1235
#, c-format
msgid "Right side file"
-msgstr "File sul lato destro"
+msgstr "File lato destro"
#: Merge.rc:1238
#, c-format
@@ -1995,12 +1996,12 @@
#: Merge.rc:1240
#, c-format
msgid "Dis&card changes"
-msgstr "Sca&rta le modifiche"
+msgstr "Ignora le modifiche"
#: Merge.rc:1242
#, c-format
msgid "Discard All"
-msgstr "Scarta tutto"
+msgstr "Ignora tutto"
#: Merge.rc:1249
#: Merge.rc:1497
@@ -2022,7 +2023,7 @@
#: Merge.rc:1255
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr ""
+msgstr "Rileva informazioni sul codice di pagina per \n i file con questa estensione: .html, .rc, .xml \n(occorre riavviare la sessione)"
#: Merge.rc:1258
#, c-format
@@ -2032,12 +2033,12 @@
#: Merge.rc:1260
#, c-format
msgid "According to WinMerge User Interface"
-msgstr "In accordo con l'interfaccia di WinMerge"
+msgstr "In base all'nterfaccia utente di WinMerge"
#: Merge.rc:1262
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Codice di pagina personalizzato:"
#: Merge.rc:1270
#, c-format
@@ -2098,7 +2099,7 @@
#: Merge.rc:1290
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
#: Merge.rc:1293
#, c-format
@@ -2153,7 +2154,7 @@
#: Merge.rc:1328
#, c-format
msgid " Categories"
-msgstr " Categorie"
+msgstr " Categorie:"
#: Merge.rc:1330
#, c-format
@@ -2275,27 +2276,27 @@
#: Merge.rc:1950
#, c-format
msgid "Archive Support"
-msgstr "Supporto per gli archivi"
+msgstr "File compressi"
#: Merge.rc:1436
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "Il supporto per gli archivi richiede l'installazione del plugin per 7-Zip:"
+msgstr "Il supporto per i file compressi richiede il plugin per 7-Zip:"
#: Merge.rc:1438
#, c-format
msgid "Download 7-zip Plugin"
-msgstr "Scarica il plugin per 7-Zip"
+msgstr "Scarica plugin 7-Zip"
#: Merge.rc:1439
#, c-format
msgid "&Enable archive file support"
-msgstr "&Attiva il supporto per i file di archivio"
+msgstr "&Abilita il supporto per i file compressi"
#: Merge.rc:1441
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr "&Utilizza installazione standard di 7-Zip se disponibile"
+msgstr "&Utilizza 7-Zip stand-alone se disponibile"
#: Merge.rc:1444
#, c-format
@@ -2373,18 +2374,18 @@
#: Merge.rc:1500
#, c-format
msgid "Affects"
-msgstr "Coinvolge"
+msgstr "Applica a:"
#: Merge.rc:1503
#: Merge.rc:1506
#, c-format
msgid "(Affects)"
-msgstr "(Coinvolge)"
+msgstr "(Applicati)"
#: Merge.rc:1507
#, c-format
msgid "Select Codepage for"
-msgstr "Scegli codice di pagina per"
+msgstr "Seleziona codice di pagina per:"
#: Merge.rc:1508
#, c-format
@@ -2461,12 +2462,12 @@
#: Merge.rc:1548
#, c-format
msgid "Custom text colors"
-msgstr "Colori personalizzati per il testo"
+msgstr "Colori testo personalizzati:"
#: Merge.rc:1550
#, c-format
msgid "Whitespace:"
-msgstr "Spazi bianchi:"
+msgstr "Spazi vuoti:"
#: Merge.rc:1551
#, c-format
@@ -2578,23 +2579,23 @@
#: Merge.rc:1641
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugin"
#: Merge.rc:1644
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Abilita plugin"
#: Merge.rc:1655
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Integrazione della shell"
#: Merge.rc:1658
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1659
#, c-format
@@ -2609,17 +2610,17 @@
#: Merge.rc:1663
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&Aggiungi al menu contestuale"
#: Merge.rc:1665
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Confronta cartella"
#: Merge.rc:1666
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "Aggiungi menu della &Shell al menu contestuale"
#: Merge.rc:1673
#: Merge.rc:1955
@@ -2641,12 +2642,12 @@
#: Merge.rc:1681
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "&Metodo di confronto:"
#: Merge.rc:1682
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "Limite per il confronto &rapido (MB):"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2701,8 +2702,8 @@
"Create empty documents\n"
"New Documents (Ctrl+N)"
msgstr ""
-"Crea due nuovi documenti vuoti\n"
-"Nuovi documenti (Ctrl+N)"
+"Crea un nuovo documento\n"
+"Nuovo (Ctrl+N)"
#: Merge.rc:1757
#, c-format
@@ -2784,17 +2785,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Attiva/Disattiva modalit\xE0 struttura"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Espandi tutte le sottocartelle"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Comprimi tutte le sottocartelle"
#: Merge.rc:1778
#, c-format
@@ -2802,8 +2803,8 @@
"Open project file\n"
"Project file (Ctrl+J)"
msgstr ""
-"Apre un file di progetto\n"
-"File di progetto (Ctrl+J)"
+"Apre un file progetto\n"
+"File progetto (Ctrl+J)"
#: Merge.rc:1779
#, c-format
@@ -2818,7 +2819,7 @@
#: Merge.rc:1781
#, c-format
msgid "Project File"
-msgstr "File di progetto"
+msgstr "File progetto"
#: Merge.rc:1782
#, c-format
@@ -2836,8 +2837,8 @@
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
-"Salva i percorsi correnti e le opzioni in un file di progetto\n"
-"Salva il file di progetto"
+"Salva le opzioni e i percorsi per il file progetto\n"
+"Salva file progetto"
#: Merge.rc:1789
#, c-format
@@ -2845,8 +2846,8 @@
"Display program information, version number and copyright\n"
"About"
msgstr ""
-"Visualizza le informazioni sul programma, il numero di versione e le informazioni di copyright\n"
-"Informazioni su"
+"Visualizza le informazioni sul programma, il numero di versione e il copyright\n"
+"Informazioni su..."
#: Merge.rc:1790
#, c-format
@@ -2883,7 +2884,7 @@
"Switch to the next window pane\n"
"Next Pane"
msgstr ""
-"Passa al riquadro della finestra successivo\n"
+"Passa al riquadro della finestra successiva\n"
"Riquadro successivo"
#: Merge.rc:1817
@@ -2892,7 +2893,7 @@
"Switch back to the previous window pane\n"
"Previous Pane"
msgstr ""
-"Ritorna al riquadro della finestra precedente\n"
+"Torna al riquadro della finestra precedente\n"
"Riquadro precedente"
#: Merge.rc:1823
@@ -2955,7 +2956,7 @@
"Insert Clipboard contents\n"
"Paste"
msgstr ""
-"Inserisce il contenuto degli Appunti\n"
+"Inserisce il contenuto degli Appunti nella posizione selezionata\n"
"Incolla"
#: Merge.rc:1835
@@ -3062,12 +3063,12 @@
#: Merge.rc:1858
#, c-format
msgid "Switch to the next document window"
-msgstr "Passa alla finestra successiva del documento "
+msgstr "Passare alla finestra del documento successivo"
#: Merge.rc:1859
#, c-format
msgid "Switch to the previous document window"
-msgstr "Passa alla finestra precedente del documento"
+msgstr "Passare alla finestra del documento precedente"
#: Merge.rc:1860
#, c-format
@@ -3128,11 +3129,18 @@
"WinMerge.FolderCompare\n"
"WinMerge Folder Compare"
msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
#: Merge.rc:1888
#, c-format
msgid "Preserve original EOL chars"
-msgstr "Conserva caratteri di fine linea originali"
+msgstr "Mantieni caratteri EOL (fine riga) originali"
#: Merge.rc:1895
#, c-format
@@ -3227,12 +3235,12 @@
#: Merge.rc:1935
#, c-format
msgid "Don't ask this &question again."
-msgstr "Non farmi pi\xF9 &questa domanda."
+msgstr "Non visualizzare pi\xF9 &questa finestra."
#: Merge.rc:1946
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "Sintassi"
#: Merge.rc:1948
#, c-format
@@ -3283,7 +3291,7 @@
#: Merge.rc:1974
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1980
#, c-format
@@ -3370,32 +3378,32 @@
#: Merge.rc:2012
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:2013
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:2014
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:2015
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:2021
#, c-format
msgid "Full Contents"
-msgstr "Contenuti completi"
+msgstr "Contenuto (completo)"
#: Merge.rc:2022
#, c-format
msgid "Quick Contents"
-msgstr "Contenuti rapidi"
+msgstr "Contenuto (rapido)"
#: Merge.rc:2023
#, c-format
@@ -3528,12 +3536,12 @@
#: Merge.rc:2062
#, c-format
msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
-msgstr ""
+msgstr "I filtri sono stati aggiornati. Vuoi adeguare le cartelle aperte per il confronto?\n\nScegliendo No \xE8 possibile non adeguare adesso le cartelle e farlo in seguito."
#: Merge.rc:2069
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "Percorso SS.EXE"
#: Merge.rc:2075
#, c-format
@@ -3618,12 +3626,12 @@
#: Merge.rc:2096
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Annullamento dell'ultima operazione..."
#: Merge.rc:2097
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Ripristino dell'operazione precedente..."
#: Merge.rc:2103
#, c-format
@@ -3648,7 +3656,7 @@
#: Merge.rc:2107
#, c-format
msgid "Difference %1 of %2"
-msgstr "Differenza %1 su %2"
+msgstr "Differenza %1 di %2"
#: Merge.rc:2108
#, c-format
@@ -3669,7 +3677,7 @@
#: Merge.rc:2116
#, c-format
msgid "Item %1 of %2"
-msgstr "Elemento %1 su %2"
+msgstr "Elemento %1 di %2"
#: Merge.rc:2117
#, c-format
@@ -3709,7 +3717,7 @@
#: Merge.rc:2129
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Seleziona due file per attivare la selezione dello scompattatore."
+msgstr "Scegli due file per attivare lo scompattatore."
#: Merge.rc:2130
#, c-format
@@ -3742,7 +3750,7 @@
#: Merge.rc:2139
#, c-format
msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "Impossibile analizzare il file in conflitto."
#: Merge.rc:2140
#, c-format
@@ -3867,7 +3875,7 @@
#: Merge.rc:2158
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
-msgstr ""
+msgstr "Un'altra applicazione ha aggiornato il file\n%1\nda quando \xE8 stato analizzato l'ultima volta con WinMerge.\n\nVuoi ricaricare il file?"
#: Merge.rc:2159
#, c-format
@@ -3882,7 +3890,7 @@
#: Merge.rc:2161
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
-msgstr ""
+msgstr "Non \xE8 possibile trovare il file\n%1.\nPer proseguire \xE8 necessario salvare una copia del file."
#: Merge.rc:2167
#, c-format
@@ -3969,24 +3977,24 @@
#: Merge.rc:2191
#, c-format
msgid "Break at whitespace"
-msgstr "Interrompi agli spazi bianchi"
+msgstr "Interrompi agli spazi vuoti"
#: Merge.rc:2192
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Interrompi agli spazi bianchi o punteggiatura"
+msgstr "Interrompi agli spazi vuoti o di punteggiatura"
#: Merge.rc:2198
#: Merge.rc:2200
#, c-format
msgid "Copy selected item to named directory"
-msgstr "Copia elemento selezionato in una cartella specifica"
+msgstr "Copia l'elemento selezionato in una cartella specifica"
#: Merge.rc:2199
#: Merge.rc:2201
#, c-format
msgid "Copy selected item to custom directory"
-msgstr "Copia elemento selezionato in una cartella personalizzata"
+msgstr "Copia l'elemento selezionato in una cartella personalizzata"
#: Merge.rc:2202
#, c-format
@@ -4006,7 +4014,7 @@
#: Merge.rc:2205
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
-msgstr "Nascondi gli elementi selezionati (filtro al volo)"
+msgstr "Nasconde l'elemento o gli elementi selezionati (filtro rapido)"
#: Merge.rc:2206
#, c-format
@@ -4016,22 +4024,22 @@
#: Merge.rc:2207
#, c-format
msgid "Right to Left (%1)"
-msgstr "Da Destra a Sinistra (%1)"
+msgstr "Da destra verso sinistra (%1)"
#: Merge.rc:2208
#, c-format
msgid "Left to Right (%1)"
-msgstr "Da Sinistra a Destra (%1)"
+msgstr "Da sinistra verso destra (%1)"
#: Merge.rc:2209
#, c-format
msgid "Right to Left (%1 of %2)"
-msgstr "Da Destra a Sinistra (%1 su %2)"
+msgstr "Da destra verso sinistra (%1 di %2)"
#: Merge.rc:2210
#, c-format
msgid "Left to Right (%1 of %2)"
-msgstr "Da Sinistra a Destra (%1 su %2)"
+msgstr "Da sinistra verso destra (%1 di %2)"
#: Merge.rc:2211
#: Merge.rc:2227
@@ -4049,13 +4057,13 @@
#: Merge.rc:2229
#, c-format
msgid "Left to... (%1 of %2)"
-msgstr "Sinistra in... (%1 su %2)"
+msgstr "Sinistra in... (%1 di %2)"
#: Merge.rc:2214
#: Merge.rc:2230
#, c-format
msgid "Right to... (%1 of %2)"
-msgstr "Destra in... (%1 su %2)"
+msgstr "Destra in... (%1 di %2)"
#: Merge.rc:2220
#, c-format
@@ -4075,17 +4083,17 @@
#: Merge.rc:2223
#, c-format
msgid "Left (%1 of %2)"
-msgstr "Sinistra (%1 su %2)"
+msgstr "Sinistra (%1 di %2)"
#: Merge.rc:2224
#, c-format
msgid "Right (%1 of %2)"
-msgstr "Destra (%1 su %2)"
+msgstr "Destra (%1 di %2)"
#: Merge.rc:2225
#, c-format
msgid "Both (%1 of %2)"
-msgstr "Entrambi (%1 su %2)"
+msgstr "Entrambi (%1 di %2)"
#: Merge.rc:2226
#, c-format
@@ -4105,12 +4113,12 @@
#: Merge.rc:2233
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 file coinvolti)"
+msgstr "(%1 file applicati)"
#: Merge.rc:2234
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 file su %2 coinvolti)"
+msgstr "(%1 file di %2 applicati)"
#: Merge.rc:2240
#, c-format
@@ -4155,22 +4163,22 @@
#: Merge.rc:2244
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Sei sicuro di voler spostare:"
#: Merge.rc:2245
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Sei sicuro di voler spostare %d elementi"
#: Merge.rc:2247
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Conferma spostamento"
#: Merge.rc:2253
#, c-format
msgid "Open left file"
-msgstr "Apre il file di sinistra"
+msgstr "Apre il file di sinistra con l'applicazione predefinita"
#: Merge.rc:2254
#, c-format
@@ -4180,12 +4188,12 @@
#: Merge.rc:2255
#, c-format
msgid "Open left file with ..."
-msgstr "Apre il file di sinistra con..."
+msgstr "Permette di indicare un programma con cui aprire il file di sinistra"
#: Merge.rc:2256
#, c-format
msgid "Open right file"
-msgstr "Apre il file di destra"
+msgstr "Apre il file di destra con l'applicazione predefinita"
#: Merge.rc:2257
#, c-format
@@ -4195,7 +4203,7 @@
#: Merge.rc:2258
#, c-format
msgid "Open right file with..."
-msgstr "Apre il file di destra con..."
+msgstr "Permette di indicare un programma con cui aprire il file di destra"
#: Merge.rc:2259
#, c-format
@@ -4230,12 +4238,12 @@
#: Merge.rc:2270
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Men\xF9 Shell sinistro"
#: Merge.rc:2271
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Men\xF9 Shell destro"
#: Merge.rc:2277
#, c-format
@@ -4360,22 +4368,22 @@
#: Merge.rc:2314
#, c-format
msgid "Left EOL"
-msgstr "EOL di sinistra"
+msgstr "Fine riga (EOL) di sinistra"
#: Merge.rc:2315
#, c-format
msgid "Right EOL"
-msgstr "EOL di destra"
+msgstr "Fine riga (EOL) di destra"
#: Merge.rc:2321
#, c-format
msgid "Left Encoding"
-msgstr "Codifica di sinistra"
+msgstr "Codifica sinistra"
#: Merge.rc:2322
#, c-format
msgid "Right Encoding"
-msgstr "Codifica di destra"
+msgstr "Codifica destra"
#: Merge.rc:2323
#, c-format
@@ -4436,7 +4444,7 @@
#: Merge.rc:2341
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Le cartelle sono diverse"
#: Merge.rc:2342
#, c-format
@@ -4456,12 +4464,12 @@
#: Merge.rc:2346
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "I file di testo sono uguali"
#: Merge.rc:2351
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "I file di testo sono diversi"
#: Merge.rc:2357
#, c-format
@@ -4571,12 +4579,12 @@
#: Merge.rc:2388
#, c-format
msgid "Left side file EOL type"
-msgstr "Tipo di fine linea nel file di sinistra"
+msgstr "Tipo di EOL (fine riga) file di sinistra"
#: Merge.rc:2389
#, c-format
msgid "Right side file EOL type"
-msgstr "Tipo di fine linea nel file di destra"
+msgstr "Tipo di EOL (fine riga) file di destra"
#: Merge.rc:2395
#, c-format
@@ -4676,11 +4684,11 @@
"\n"
"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 ""
-"Questi file usano tipi diversi di carriage return.\n"
+"Questi file usano tipi diversi di ritorno a capo.\n"
"\n"
-"Desideri trattarli tutti come se fossero equivalenti in questo confronto?\n"
+"In questo confronto desideri trattarli tutti come se fossero equivalenti?\n"
"\n"
-"Nota: Se vuoi sempre trattare tutti i tipi di carriage return come equivalenti, imposta l'opzione 'Ignora le differenze di carriage return' nella linguetta Confronto delle Opzioni (raggiungibile dal menu Modifica->Opzioni)."
+"Nota: Se vuoi sempre trattare tutti i tipi di ritorno a capo come equivalenti, imposta l'opzione\n'Ignora le differenze di ritorno a capo' nella scheda Comparazione della finestra delle Opzioni\n(raggiungibile dal menu Modifica/Opzioni)."
#: Merge.rc:2424
#, c-format
@@ -4762,7 +4770,7 @@
#: Merge.rc:2445
#, c-format
msgid "Line difference"
-msgstr "Differenza della linea"
+msgstr "Differenza della riga"
#: Merge.rc:2451
#, c-format
@@ -4787,12 +4795,12 @@
#: Merge.rc:2465
#, c-format
msgid "Location Pane"
-msgstr "Pannello della locazione"
+msgstr "Posizione"
#: Merge.rc:2466
#, c-format
msgid "Diff Pane"
-msgstr "Pannello delle differenze"
+msgstr "Differenze"
#: Merge.rc:2472
#, c-format
@@ -4887,9 +4895,9 @@
"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
"See manual for more info about archive support and how to enable it."
msgstr ""
-"Il supporto per gli archivi non \xE8 attivo.\n"
-"Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto sono stati trovati.\n"
-"Guarda il manuale per ulteriori informazioni sugli archivi e come attivare il supporto per essi."
+"Il supporto per i file compressi non \xE8 attivo.\n"
+"Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto dei file compressi \xE8 stato trovato.\n"
+"Guarda il manuale per ulteriori informazioni sugli archivi compressi e come attivare il relativo supporto."
#: Merge.rc:2493
#, c-format
@@ -5053,22 +5061,22 @@
#: Merge.rc:2536
#, c-format
msgid "Mixed"
-msgstr "Mescolato"
+msgstr "Misto"
#: Merge.rc:2538
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2539
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2540
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2547
#, c-format
@@ -5103,22 +5111,22 @@
#: Merge.rc:2558
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Tipo"
#: Merge.rc:2560
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "Scompattatore"
#: Merge.rc:2561
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "Prediffer"
#: Merge.rc:2562
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Script Editor"
#: Merge.rc:2569
#, c-format
@@ -5143,32 +5151,32 @@
#: Merge.rc:2573
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Modifica file sinistro/stato cartella di sola lettura"
#: Merge.rc:2574
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Modifica file destro/stato cartella di sola lettura"
#: Merge.rc:2575
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr "Converte EOL nella modalit\xE0 Windows"
+msgstr "Converte fine riga (EOL) nella modalit\xE0 Windows"
#: Merge.rc:2576
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr "Converte EOL nella modalit\xE0 Unix"
+msgstr "Converte fine riga (EOL) nella modalit\xE0 Unix"
#: Merge.rc:2577
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr "Converte EOL nella modalit\xE0 Mac"
+msgstr "Converte fine riga (EOL) nella modalit\xE0 Mac"
#: Merge.rc:2578
#, c-format
msgid "Switch between editing and merging modes"
-msgstr "Passa dalla modalit\xE0 di editing a quella di 'Unione', in cui l'integrazione delle differenze\xE8 pi\xF9 rapida"
+msgstr "Passa dalla modalit\xE0 di editing a quella di 'Unione', in cui l'integrazione delle differenze \xE8 pi\xF9 rapida"
#: Merge.rc:2579
#, c-format
@@ -5182,7 +5190,7 @@
#: Merge.rc:2580
#, c-format
msgid "Open and resolve conflict file"
-msgstr ""
+msgstr "Apre e risolve i conflitti dei file"
#: Merge.rc:2586
#, c-format
@@ -5190,8 +5198,8 @@
"Select difference area in the current line\n"
"Difference in the Current Line"
msgstr ""
-"Seleziona l'area della differenza nella linea corrente\n"
-"Differenza nella linea corrente"
+"Seleziona l'area della differenza nella riga corrente\n"
+"Differenza nella riga corrente"
#: Merge.rc:2587
#, c-format
@@ -5199,7 +5207,7 @@
"Go to line or difference\n"
"Go to (Ctrl+G)"
msgstr ""
-"Vai a una linea o una differenza\n"
+"Permette di spostarsi su una riga o una differenza specifiche\n"
"Vai a (Ctrl+G)"
#: Merge.rc:2588
@@ -5223,7 +5231,7 @@
#: Merge.rc:2590
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
-msgstr "Copia le linee selezionate negli Appunti aggiungendo i numeri di linea all'inizio"
+msgstr "Copia le righe selezionate negli Appunti aggiungendo i numeri di linea all'inizio"
#: Merge.rc:2591
#, c-format
@@ -5238,12 +5246,12 @@
#: Merge.rc:2593
#, c-format
msgid "Go to next bookmark"
-msgstr "Va al segnalibro successivo"
+msgstr "Passa al segnalibro successivo"
#: Merge.rc:2594
#, c-format
msgid "Go to previous bookmark"
-msgstr "Va al segnalibro precedente"
+msgstr "Passa al segnalibro precedente"
#: Merge.rc:2595
#, c-format
@@ -5325,17 +5333,17 @@
#: Merge.rc:2614
#, c-format
msgid "Shows whitespace characters"
-msgstr "Mostra gli spazi bianchi"
+msgstr "Mostra caratteri di spaziatura"
#: Merge.rc:2615
#, c-format
msgid "Toggle Diff Pane"
-msgstr "Mostra il pannello delle differenze"
+msgstr "Mostra il riquadro delle differenze"
#: Merge.rc:2616
#, c-format
msgid "Location pane shows overall picture from files"
-msgstr "Il pannello della locazione mostra un'immagine complessiva dei file"
+msgstr "Il riquadro della posizione mostra un'immagine complessiva dei file"
#: Merge.rc:2617
#, c-format
@@ -5380,8 +5388,8 @@
"Enable word wrap\n"
"Wrap Lines"
msgstr ""
-"Vai a capo automaticamente\n"
-"Va a capo automaticamente (word wrap)"
+"Abilita la funzione di a capo automatico\n"
+"Righe di a capo"
#: Merge.rc:2623
#, c-format
@@ -5400,7 +5408,7 @@
#: Merge.rc:2625
#, c-format
msgid "Decrease text size"
-msgstr "Riduci la dimensione del testo"
+msgstr "Riduce la dimensione del testo"
#: Merge.rc:2626
#, c-format
@@ -5413,7 +5421,7 @@
"Scroll to the previous difference\n"
"Previous Difference (Alt+Up)"
msgstr ""
-"Scorri alla differenza precedente\n"
+"Passa alla differenza precedente\n"
"Differenza precedente (Alt+Su)"
#: Merge.rc:2633
@@ -5422,7 +5430,7 @@
"Scroll to the next difference\n"
"Next Difference (Alt+Down)"
msgstr ""
-"Scorri alla differenza successiva\n"
+"Passa alla differenza successiva\n"
"Differenza successiva(Alt+Gi\xF9)"
#: Merge.rc:2634
@@ -5431,7 +5439,7 @@
"Scroll to the first difference\n"
"First Difference (Alt+Home)"
msgstr ""
-"Scorri alla prima differenza\n"
+"Passa alla prima differenza\n"
"Prima differenza (Alt+Home)"
#: Merge.rc:2635
@@ -5449,7 +5457,7 @@
"Scroll to the last difference\n"
"Last Difference (Alt+End)"
msgstr ""
-"Scorri all'ultima differenza\n"
+"Passa all'ultima differenza\n"
"Ultima differenza (Alt+Fine)"
#: Merge.rc:2637
@@ -5476,7 +5484,7 @@
"Copy difference to right and advance to next\n"
"Copy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-"Copia la differenza a destra e avanza alla prossima\n"
+"Copia la differenza a destra e passa alla successiva discrepanza\n"
"Copia a destra e avanza (Ctrl+Alt+Destra)"
#: Merge.rc:2640
@@ -5485,7 +5493,7 @@
"Copy difference to left and advance to next\n"
"Copy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-"Copia la differenza a sinistra e avanza alla prossima\n"
+"Copia la differenza a sinistra e passa alla successiva discrepanza\n"
"Copia a sinistra e avanza (Ctrl+Alt+Sinistra)"
#: Merge.rc:2641
@@ -5514,7 +5522,7 @@
#: Merge.rc:2644
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
-msgstr "Confronta l'elemento selezionato (confronta il primo elemento se ne sono stati selezionati pi\xF9 di uno)"
+msgstr "Confronta l'elemento selezionato (raffronta il primo elemento se ne sono stati selezionati pi\xF9 di uno)"
#: Merge.rc:2650
#, c-format
@@ -5539,7 +5547,7 @@
#: Merge.rc:2659
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Visualizza lista dei plugin disponibili"
#: Merge.rc:2660
#, c-format
@@ -5549,7 +5557,7 @@
#: Merge.rc:2661
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Lo scompattatore adatto \xE8 applicato a entrambi i file (\xE8 sufficiente che uno dei file abbia l'estensione)"
+msgstr "Lo scompattatore adatto \xE8 applicato a entrambi i file (\xE8 sufficiente che solo uno dei file abbia l'estensione)"
#: Merge.rc:2662
#, c-format
@@ -5559,7 +5567,7 @@
#: Merge.rc:2663
#, c-format
msgid "No prediffer (normal)"
-msgstr "No prediffer (normale)"
+msgstr "Senza prediffer (normale)"
#: Merge.rc:2664
#, c-format
@@ -5582,8 +5590,8 @@
"Activates next visible file\n"
"Activate next File"
msgstr ""
-"Attiva il prossimo file visibile\n"
-"Attiva prossimo file"
+"Attiva il successivo file visibile\n"
+"Attiva file successivo"
#: Merge.rc:2673
#, c-format
@@ -5596,13 +5604,13 @@
"Opens the WinMerge Help\n"
"WinMerge Help"
msgstr ""
-"Apri la Guida di WinMerge\n"
-"Guida WinMerge"
+"Apre la guida di WinMerge\n"
+"Guida di WinMerge"
#: Merge.rc:2680
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
-msgstr "Invia le informazioni sulla versione e la configurazione corrente di WinMerge a un file di testo"
+msgstr "Visualizza un file di testo con le informazioni sulla versione e la configurazione attuale di WinMerge"
#: Merge.rc:2681
#, c-format
@@ -5620,7 +5628,7 @@
"Opens the release notes document\n"
"Release Notes"
msgstr ""
-"Apri il documento delle note di rilascio\n"
+"Apre il documento delle note di rilascio\n"
"Note di rilascio"
#: Merge.rc:2684
@@ -5629,7 +5637,7 @@
"Opens the translations website\n"
"Translations"
msgstr ""
-"Apri il sito per le traduzioni\n"
+"Apre la pagina web delle traduzioni\n"
"Traduzioni"
#: Merge.rc:2690
@@ -5665,17 +5673,17 @@
#: Merge.rc:2702
#, c-format
msgid "Open the file with registered application"
-msgstr "Apri il file con l'applicazione registrata per esso"
+msgstr "Apre il file con l'applicazione predefinita"
#: Merge.rc:2703
#, c-format
msgid "Open the file with external editor"
-msgstr "Apri il file con l'editor esterno"
+msgstr "Apre il file con l'editor esterno"
#: Merge.rc:2704
#, c-format
msgid "Open the file with a particular program"
-msgstr "Apri il file con un programma specifico"
+msgstr "Permette di indicare un programma con cui aprire il file"
#: Merge.rc:2710
#, c-format
@@ -5700,12 +5708,12 @@
#: Merge.rc:2714
#, c-format
msgid "G&oto Diff %1 of %2"
-msgstr "Vai alla &differenza %1 su %2"
+msgstr "Vai alla &differenza %1 di %2"
#: Merge.rc:2715
#, c-format
msgid "G&oto Line %1"
-msgstr "Vai alla &linea %1"
+msgstr "Vai alla &riga %1"
#: Merge.rc:2721
#, c-format
@@ -5725,7 +5733,7 @@
#: Merge.rc:2729
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Non evidenziare"
#: Merge.rc:2730
#, c-format
@@ -5820,12 +5828,12 @@
#: Merge.rc:2748
#, c-format
msgid "Portable Object"
-msgstr "Oggetto portabile"
+msgstr "Portable Object"
#: Merge.rc:2749
#, c-format
msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
#: Merge.rc:2750
#, c-format
@@ -5840,7 +5848,7 @@
#: Merge.rc:2752
#, c-format
msgid "Resources"
-msgstr "Risorse"
+msgstr "Resources"
#: Merge.rc:2753
#, c-format
@@ -5880,7 +5888,7 @@
#: Merge.rc:2760
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2761
#, c-format
@@ -5890,7 +5898,7 @@
#: Merge.rc:2766
#, c-format
msgid "Hide the toolbar"
-msgstr "Nascondi la barra degli strumenti"
+msgstr "Nasconde la barra degli strumenti"
#: Merge.rc:2767
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-10 14:55:06
|
Revision: 7608
http://sourceforge.net/p/winmerge/code/7608
Author: christianlist
Date: 2013-03-10 14:55:03 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
[patches:#3027] Winmerge 2.14.0 Spanish Translation Update
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Spanish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2013-03-10 14:49:57 UTC (rev 7607)
+++ trunk/Docs/Users/ChangeLog.txt 2013-03-10 14:55:03 UTC (rev 7608)
@@ -30,7 +30,7 @@
- Bulgarian (#3082392)
- French (#3412030)
- Hungarian (#3164982)
- - Spanish (#3412937)
+ - Spanish (#3412937, patches:#3027)
- Russian (patches:#3017)
- Norwegian (patches:#3018)
- Danish (patches:#3019)
Modified: trunk/Translations/WinMerge/Spanish.po
===================================================================
--- trunk/Translations/WinMerge/Spanish.po 2013-03-10 14:49:57 UTC (rev 7607)
+++ trunk/Translations/WinMerge/Spanish.po 2013-03-10 14:55:03 UTC (rev 7608)
@@ -5,6 +5,7 @@
# * Dean Grimm <grimmdp at yahoo.com>
# * Jes\xFAs M. Delgado 'MacK' <nncsoft at yahoo.com>
# * Mario Angel <marioangel70 at gmail.com>
+# * Alberto Cardoso <albercardoso at yahoo.es>
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -14,16 +15,16 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: 2009-02-10 22:14+0000\n"
-"PO-Revision-Date: 2011-09-21 21:52-0300\n"
-"Last-Translator: Mario Angel <marioangel70 at gmail.com>\n"
+"PO-Revision-Date: 2013-02-19 23:31+0100\n"
+"Last-Translator: Alberto Cardoso <albercardoso at yahoo.es>\n"
"Language-Team: Spanish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
"X-Poedit-SourceCharset: CP1252\n"
"X-Poedit-Basepath: ../../Src/\n"
-"X-Poedit-Country: ARGENTINA\n"
+"Language: es_AR\n"
+"X-Generator: Poedit 1.5.5\n"
#. LANGUAGE, SUBLANGUAGE
#: Merge.rc:22
@@ -293,12 +294,12 @@
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "Prediferencias Ma&nuales"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "Prediferencias A&utom\xE1ticas"
#: Merge.rc:155
#: Merge.rc:276
@@ -881,7 +882,7 @@
#: Merge.rc:506
#, c-format
msgid "Co&mpare As"
-msgstr ""
+msgstr "Co&mpara como"
#: Merge.rc:508
#, c-format
@@ -891,7 +892,7 @@
#: Merge.rc:509
#, c-format
msgid "&Binary"
-msgstr ""
+msgstr "&Binario"
#: Merge.rc:514
#, c-format
@@ -1342,8 +1343,12 @@
#: Merge.rc:789
#, c-format
-msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge permite ocultar algunos mensajes comunes. Pulse Restablecer para hacer todos los mensajes visibles de nuevo."
+msgid ""
+"WinMerge allows hiding some common messageboxes. Press the Reset button to "
+"make all messageboxes visible again."
+msgstr ""
+"WinMerge permite ocultar algunos mensajes comunes. Pulse Restablecer para "
+"hacer todos los mensajes visibles de nuevo."
#: Merge.rc:791
#, c-format
@@ -2024,7 +2029,9 @@
#: Merge.rc:1261
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr "Seleccione la p\xE1gina de c\xF3digos predeterminada a utilizar cuando se carguen archivos no Unicode:"
+msgstr ""
+"Seleccione la p\xE1gina de c\xF3digos predeterminada a utilizar cuando se carguen "
+"archivos no Unicode:"
#: Merge.rc:1263
#, c-format
@@ -2063,24 +2070,33 @@
#: Merge.rc:1284
#, 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."
+"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 ""
-"El soporte de archivos requiere 7-Zip o posterior instalado en su PC, o sus \n"
-"componentes esenciales copiados en la carpeta del programa para operar en solitario."
+"El soporte de archivos requiere 7-Zip o posterior instalado en su PC, o "
+"sus \n"
+"componentes esenciales copiados en la carpeta del programa para operar en "
+"solitario."
#: Merge.rc:1286
#, c-format
-msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "Adem\xE1s debe haber un plugin de interface apropiado (Merge7z*.dll) en la ruta."
+msgid ""
+"There must also be an appropriate interface plugin (Merge7z*.dll) on the "
+"path."
+msgstr ""
+"Adem\xE1s debe haber un plugin de interface apropiado (Merge7z*.dll) en la ruta."
#: Merge.rc:1288
#, c-format
msgid ""
-"Please use the version of 7-Zip recommended below until interface plugins for later\n"
+"Please use the version of 7-Zip recommended below until interface plugins "
+"for later\n"
"versions become available."
msgstr ""
-"Por favor, use la versi\xF3n de 7-Zip recomendada debajo hasta que haya disponible \n"
+"Por favor, use la versi\xF3n de 7-Zip recomendada debajo hasta que haya "
+"disponible \n"
"una nueva versi\xF3n del plugin de interface."
#: Merge.rc:1290
@@ -2644,7 +2660,7 @@
#: Merge.rc:1684
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "M\xE9todo de &Comparaci\xF3n"
#: Merge.rc:1686
#, c-format
@@ -2664,7 +2680,7 @@
#: Merge.rc:1692
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "Comparaci\xF3n &R\xE1pida l\xEDmite (MB):"
#. StringFileInfo.Block
#: Merge.rc:1718
@@ -3090,7 +3106,8 @@
#: Merge.rc:1870
#, c-format
msgid "Close the active window and prompts to save the documents"
-msgstr "Cierra la ventana activa y pregunta al usuario si desea guardar los cambios"
+msgstr ""
+"Cierra la ventana activa y pregunta al usuario si desea guardar los cambios"
#: Merge.rc:1875
#, c-format
@@ -3174,15 +3191,23 @@
#, c-format
msgid ""
"Developers:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi "
+"Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
"Desarrolladores:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi "
+"Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1919
#, 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 General Public License in the Help menu for details."
-msgstr "Winmerge no concede ABSOLUTAMENTE NINGUNA GARANT\xCDA. Es software libre, y puede ser redistribuido bajo ciertas reglas. Vea la Licencia P\xFAblica GNU en el men\xFA Ayuda para m\xE1s detalles."
+msgid ""
+"WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you "
+"are welcome to redistribute it under certain circumstances; see the GNU "
+"General Public License in the Help menu for details."
+msgstr ""
+"Winmerge no concede ABSOLUTAMENTE NINGUNA GARANT\xCDA. Es software libre, y "
+"puede ser redistribuido bajo ciertas reglas. Vea la Licencia P\xFAblica GNU en "
+"el men\xFA Ayuda para m\xE1s detalles."
#: Merge.rc:1925
#, c-format
@@ -3257,7 +3282,7 @@
#: Merge.rc:1956
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "Sintaxis"
#: Merge.rc:1958
#, c-format
@@ -3322,13 +3347,22 @@
#: Merge.rc:1992
#, 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 "Se han realizado modificaciones en los archivos de la sesion de comparaci\xF3n actual. Algunas configuraciones pueden no surtir efecto hasta que la comparaci\xF3n de archivos se ejecute de nuevo."
+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 ""
+"Se han realizado modificaciones en los archivos de la sesion de comparaci\xF3n "
+"actual. Algunas configuraciones pueden no surtir efecto hasta que la "
+"comparaci\xF3n de archivos se ejecute de nuevo."
#: Merge.rc:1993
#, c-format
-msgid "The selected font change will not be applied to any currently visible difference windows."
-msgstr "La fuente seleccionada no se aplicar\xE1 a ninguna de las ventanas de diferencias abiertas actualmente."
+msgid ""
+"The selected font change will not be applied to any currently visible "
+"difference windows."
+msgstr ""
+"La fuente seleccionada no se aplicar\xE1 a ninguna de las ventanas de "
+"diferencias abiertas actualmente."
#: Merge.rc:1995
#, c-format
@@ -3337,7 +3371,8 @@
"\n"
"Please use values 1 - %1."
msgstr ""
-"Valor en Tama\xF1o de Tab - el valor no est\xE1 en el rango aceptado por WinMerge.\n"
+"Valor en Tama\xF1o de Tab - el valor no est\xE1 en el rango aceptado por "
+"WinMerge.\n"
"\n"
"Por favor, utilice valores 1 - %1."
@@ -3348,7 +3383,8 @@
"\n"
"Please re-start WinMerge after the reset."
msgstr ""
-"\xBFDesea restablecer todas las configuraciones de WinMerge a las predeterminadas?\n"
+"\xBFDesea restablecer todas las configuraciones de WinMerge a las "
+"predeterminadas?\n"
"\n"
"Por favor reinicie WinMerge despu\xE9s de restablecer."
@@ -3379,13 +3415,18 @@
#: Merge.rc:2014
#, c-format
-msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-msgstr "Archivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos los archivos (*.*)|*.*||"
+msgid ""
+"Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|"
+"*.*||"
+msgstr ""
+"Archivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos "
+"los archivos (*.*)|*.*||"
#: Merge.rc:2015
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-msgstr "Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||"
+msgstr ""
+"Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||"
#: Merge.rc:2016
#, c-format
@@ -3495,10 +3536,12 @@
"\n"
"Please make sure the folder exists and is writable."
msgstr ""
-"No se pudo copiar el archivo con la plantilla de filtros de archivo a la carpeta:\n"
+"No se pudo copiar el archivo con la plantilla de filtros de archivo a la "
+"carpeta:\n"
"%1\n"
"\n"
-"Por favor, compruebe que la carpeta existe y que tiene permisos de escritura en ella."
+"Por favor, compruebe que la carpeta existe y que tiene permisos de escritura "
+"en ella."
#: Merge.rc:2053
#, c-format
@@ -3555,11 +3598,14 @@
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
"\n"
-"If you do not want to refresh all compares now you can select No and refresh compares later."
+"If you do not want to refresh all compares now you can select No and refresh "
+"compares later."
msgstr ""
-"Los Filtros fueron actualizados. \xBFQuiere actualizar todas comparaciones de carpetas abiertas?\n"
+"Los Filtros fueron actualizados. \xBFQuiere actualizar todas comparaciones de "
+"carpetas abiertas?\n"
"\n"
-"Si no quiere actualizar todas las comparaciones puede elegir No y actualizar las comparaciones despu\xE9s."
+"Si no quiere actualizar todas las comparaciones puede elegir No y actualizar "
+"las comparaciones despu\xE9s."
#: Merge.rc:2079
#, c-format
@@ -3798,8 +3844,12 @@
#: Merge.rc:2158
#, 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 es de s\xF3lo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo con un nuevo nombre.)"
+msgid ""
+"%1 is marked read-only. Would you like to override the read-only file ? (No "
+"to save as new filename.)"
+msgstr ""
+"%1 es de s\xF3lo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo "
+"con un nuevo nombre.)"
#: Merge.rc:2159
#, c-format
@@ -3850,7 +3900,8 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"El Plugin '%2' no pudo empaquetar sus cambios al archivo de la izquierda en '%1'.\n"
+"El Plugin '%2' no pudo empaquetar sus cambios al archivo de la izquierda en "
+"'%1'.\n"
"\n"
"El archivo original no ser\xE1 cambiado.\n"
"\n"
@@ -3865,7 +3916,8 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"El Plugin '%2' no pudo empaquetar sus cambios al archivo de la derecha en '%1'.\n"
+"El Plugin '%2' no pudo empaquetar sus cambios al archivo de la derecha en "
+"'%1'.\n"
"\n"
"El archivo original no ser\xE1 cambiado.\n"
"\n"
@@ -3938,14 +3990,19 @@
"\n"
"Refresh documents before continuing."
msgstr ""
-"No se pueden combinar las diferencias cuando los documentos no est\xE1n sincronizados.\n"
+"No se pueden combinar las diferencias cuando los documentos no est\xE1n "
+"sincronizados.\n"
"\n"
"Actualize los documentos antes de continuar."
#: Merge.rc:2183
#, c-format
-msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
-msgstr "Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/MiProyecto)"
+msgid ""
+"You must specify a SourceSafe project path in order to continue (ie: $/"
+"MyProject)"
+msgstr ""
+"Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/"
+"MiProyecto)"
#: Merge.rc:2184
#, c-format
@@ -3954,8 +4011,12 @@
#: Merge.rc:2185
#, c-format
-msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "El sistema de versionado devolv\xEDo un error mientras trataba de desproteger el archivo. Imposible continuar..."
+msgid ""
+"Versioning System returned an error while attempting to check out the file. "
+"Unable to continue..."
+msgstr ""
+"El sistema de versionado devolv\xEDo un error mientras trataba de desproteger "
+"el archivo. Imposible continuar..."
#: Merge.rc:2186
#, c-format
@@ -3964,8 +4025,12 @@
#: Merge.rc:2187
#, c-format
-msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
-msgstr "La carpeta de trabajo de VSS y la ubicaci\xF3n del archivo actual no coinciden. \xBFContinuar?"
+msgid ""
+"The VSS Working Folder and the location of the current file do not match. "
+"Continue?"
+msgstr ""
+"La carpeta de trabajo de VSS y la ubicaci\xF3n del archivo actual no coinciden. "
+"\xBFContinuar?"
#: Merge.rc:2188
#, c-format
@@ -3984,17 +4049,20 @@
" Please, check config spec of used view.\n"
" Undo checkout operation?"
msgstr ""
-"El sistema de versionado devolvi\xF3 un error cuando se intentaba proteger el archivo.\n"
+"El sistema de versionado devolvi\xF3 un error cuando se intentaba proteger el "
+"archivo.\n"
" Por favor, compruebe la configuraci\xF3n de la vista utilizada.\n"
" \xBFDesea deshacer la desprotecci\xF3n?"
#: Merge.rc:2191
#, c-format
msgid ""
-"Versioning System returned an error while attempting to undo checkout the file.\n"
+"Versioning System returned an error while attempting to undo checkout the "
+"file.\n"
" Please, check config spec of used view. "
msgstr ""
-"El sistema de versionado devolvi\xF3 un error cuando se intentaba deshacer la desprotecci\xF3n del archivo.\n"
+"El sistema de versionado devolvi\xF3 un error cuando se intentaba deshacer la "
+"desprotecci\xF3n del archivo.\n"
" Por favor, compruebe la configuraci\xF3n de la vista utilizada. "
#: Merge.rc:2197
@@ -4593,12 +4661,14 @@
#: Merge.rc:2393
#, c-format
msgid "Left side file version, only for some filetypes."
-msgstr "Versi\xF3n del archivo del lado izquierdo, s\xF3lo para algunos tipos de archivo."
+msgstr ""
+"Versi\xF3n del archivo del lado izquierdo, s\xF3lo para algunos tipos de archivo."
#: Merge.rc:2394
#, c-format
msgid "Right side file version, only for some filetypes."
-msgstr "Versi\xF3n del archivo del lado derecho, s\xF3lo para algunos tipos de archivo."
+msgstr ""
+"Versi\xF3n del archivo del lado derecho, s\xF3lo para algunos tipos de archivo."
#: Merge.rc:2395
#, c-format
@@ -4637,13 +4707,21 @@
#: Merge.rc:2407
#, c-format
-msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr "N\xFAmero de diferencias ignoradas en el archivo. Estas diferencias son ignoradas por WinMerge y no se pueden combinar."
+msgid ""
+"Number of ignored differences in file. These differences are ignored by "
+"WinMerge and cannot be merged."
+msgstr ""
+"N\xFAmero de diferencias ignoradas en el archivo. Estas diferencias son "
+"ignoradas por WinMerge y no se pueden combinar."
#: Merge.rc:2408
#, c-format
-msgid "Number of differences in file. This number does not include ignored differences."
-msgstr "N\xFAmero de diferencias en el archivo. Este n\xFAmero no incluye las diferencias ignoradas."
+msgid ""
+"Number of differences in file. This number does not include ignored "
+"differences."
+msgstr ""
+"N\xFAmero de diferencias en el archivo. Este n\xFAmero no incluye las diferencias "
+"ignoradas."
#: Merge.rc:2409
#, c-format
@@ -4711,23 +4789,33 @@
#: Merge.rc:2432
#, c-format
-msgid "Temporary files could not be created. Check your temporary path settings."
-msgstr "Los archivos temporales no se pudieron crear. Compruebe su ruta para archivos temporales."
+msgid ""
+"Temporary files could not be created. Check your temporary path settings."
+msgstr ""
+"Los archivos temporales no se pudieron crear. Compruebe su ruta para "
+"archivos temporales."
#: Merge.rc:2433
#, c-format
msgid ""
"These files use different carriage return types.\n"
"\n"
-"Do you want to treat all carriage return types as equivalent for this comparison?\n"
+"Do you want to treat all carriage return types as equivalent for this "
+"comparison?\n"
"\n"
-"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)."
+"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 ""
"Estos archivos utilizan tipos diferentes de salto de l\xEDnea.\n"
"\n"
-"\xBFDesea tratar todos los tipos de salto de l\xEDnea como equivalentes para esta comparaci\xF3n?\n"
+"\xBFDesea tratar todos los tipos de salto de l\xEDnea como equivalentes para esta "
+"comparaci\xF3n?\n"
"\n"
-"Nota: si desea tratar siempre todos los tipos de saltos de l\xEDnea como equivalentes, seleccione la opci\xF3n 'Ignorar saltos de l\xEDnea diferentes..' en la pesta\xF1a Comparar del dialogo Configuraci\xF3n (disponible en Editar/Configuraci\xF3n)."
+"Nota: si desea tratar siempre todos los tipos de saltos de l\xEDnea como "
+"equivalentes, seleccione la opci\xF3n 'Ignorar saltos de l\xEDnea diferentes..' en "
+"la pesta\xF1a Comparar del dialogo Configuraci\xF3n (disponible en Editar/"
+"Configuraci\xF3n)."
#: Merge.rc:2434
#, c-format
@@ -4742,8 +4830,12 @@
#: Merge.rc:2435
#, c-format
-msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
-msgstr "Ocurri\xF3 un error mientras se precomparaba el archivo '%1' con el plugin '%2'. La precomparaci\xF3n no ser\xE1 aplicada de nuevo."
+msgid ""
+"An error occurred while prediffing the file '%1' with the plugin '%2'. The "
+"prediffing is not applied any more."
+msgstr ""
+"Ocurri\xF3 un error mientras se precomparaba el archivo '%1' con el plugin "
+"'%2'. La precomparaci\xF3n no ser\xE1 aplicada de nuevo."
#: Merge.rc:2436
#, c-format
@@ -4774,17 +4866,26 @@
#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files. \n"
-"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
-"Would you like to treat both files as being in the default windows codepage (recommended)?"
+"Displaying each file in its codepage will give a better display but merging/"
+"copying will be dangerous.\n"
+"Would you like to treat both files as being in the default windows codepage "
+"(recommended)?"
msgstr ""
-"Las p\xE1ginas de c\xF3digos son diferentes en el archivo de la izquierda (cp%d) y el de la derecha (cp%d). \n"
-"Mostrar cada archivo en su p\xE1gina de c\xF3digos dar\xE1 una mejor visualizaci\xF3n, pero combinar/copiar ser\xEDa peligroso.\n"
-"\xBFLe gustar\xEDa tratar ambos archivos con la p\xE1gina de c\xF3digos predeterminada de windows (recomendado)?"
+"Las p\xE1ginas de c\xF3digos son diferentes en el archivo de la izquierda (cp%d) y "
+"el de la derecha (cp%d). \n"
+"Mostrar cada archivo en su p\xE1gina de c\xF3digos dar\xE1 una mejor visualizaci\xF3n, "
+"pero combinar/copiar ser\xEDa peligroso.\n"
+"\xBFLe gustar\xEDa tratar ambos archivos con la p\xE1gina de c\xF3digos predeterminada "
+"de windows (recomendado)?"
#: Merge.rc:2445
#, c-format
-msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
-msgstr "Atenci\xF3n: los archivos utilizan codificaciones diferentes, izquierdo=%s y derecho=%s, y la combinaci\xF3n podr\xEDa provocar perdida de informaci\xF3n."
+msgid ""
+"Warning: Files use different encodings, left=%s and right=%s, and merging "
+"may lead to information loss."
+msgstr ""
+"Atenci\xF3n: los archivos utilizan codificaciones diferentes, izquierdo=%s y "
+"derecho=%s, y la combinaci\xF3n podr\xEDa provocar perdida de informaci\xF3n."
#: Merge.rc:2446
#, c-format
@@ -4799,7 +4900,8 @@
#: Merge.rc:2448
#, c-format
msgid "Information lost due to encoding errors: left file"
-msgstr "Informaci\xF3n perdida debido a errores de codificaci\xF3n: archivo izquierdo"
+msgstr ""
+"Informaci\xF3n perdida debido a errores de codificaci\xF3n: archivo izquierdo"
#: Merge.rc:2454
#, c-format
@@ -4899,7 +5001,8 @@
#: Merge.rc:2493
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "No se puede crear un archivo de correcci\xF3n a partir de un archivo binario."
+msgstr ""
+"No se puede crear un archivo de correcci\xF3n a partir de un archivo binario."
#: Merge.rc:2494
#, c-format
@@ -4915,7 +5018,8 @@
msgstr ""
"Por favor, guarde todos los archivos antes.\n"
"\n"
-"Crear una correcci\xF3n requiere que no haya cambios pendientes de ser guardados."
+"Crear una correcci\xF3n requiere que no haya cambios pendientes de ser "
+"guardados."
#: Merge.rc:2496
#, c-format
@@ -4931,12 +5035,15 @@
#, c-format
msgid ""
"Archive support is not enabled.\n"
-"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
+"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot "
+"be found.\n"
"See manual for more info about archive support and how to enable it."
msgstr ""
"El soporte de archivos no est\xE1 habilitado.\n"
-"Los componentes necesarios(7-zip y/o Merge7z*.dll) para el archivo no est\xE1n disponibles.\n"
-"Vea el manual para m\xE1s informaci\xF3n acerca del soporte de archivos y c\xF3mo habilitarlo."
+"Los componentes necesarios(7-zip y/o Merge7z*.dll) para el archivo no est\xE1n "
+"disponibles.\n"
+"Vea el manual para m\xE1s informaci\xF3n acerca del soporte de archivos y c\xF3mo "
+"habilitarlo."
#: Merge.rc:2503
#, c-format
@@ -4945,16 +5052,19 @@
"Note: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
"\n"
-"Nota: La integraci\xF3n con 7-Zip est\xE1 deshabilitada en la configuracion de WinMerge."
+"Nota: La integraci\xF3n con 7-Zip est\xE1 deshabilitada en la configuracion de "
+"WinMerge."
#: Merge.rc:2504
#, c-format
msgid ""
"\n"
-"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
+"Note: 7-Zip integration is restricted to standalone operation in WinMerge "
+"settings."
msgstr ""
"\n"
-"Nota: La integraci\xF3n con 7-Zip est\xE1 restringida a operaci\xF3n en solitario en la configuracion de WinMerge."
+"Nota: La integraci\xF3n con 7-Zip est\xE1 restringida a operaci\xF3n en solitario en "
+"la configuracion de WinMerge."
#: Merge.rc:2505
#, c-format
@@ -5270,7 +5380,9 @@
#: Merge.rc:2600
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
-msgstr "Copiar las l\xEDneas seleccionadas al portapapeles a\xF1adiendo n\xFAmeros de l\xEDnea al principio de cada una de ellas"
+msgstr ""
+"Copiar las l\xEDneas seleccionadas al portapapeles a\xF1adiendo n\xFAmeros de l\xEDnea "
+"al principio de cada una de ellas"
#: Merge.rc:2601
#, c-format
@@ -5561,7 +5673,9 @@
#: Merge.rc:2654
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
-msgstr "Compara el elemento seleccionado (compara el primero si hay m\xFAltiples elementos seleccionados)"
+msgstr ""
+"Compara el elemento seleccionado (compara el primero si hay m\xFAltiples "
+"elementos seleccionados)"
#: Merge.rc:2660
#, c-format
@@ -5591,12 +5705,18 @@
#: Merge.rc:2670
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
-msgstr "El usuario selecciona el desempaquetador (no se desempaqueta cuando se comparan carpetas)"
+msgstr ""
+"El usuario selecciona el desempaquetador (no se desempaqueta cuando se "
+"comparan carpetas)"
#: Merge.rc:2671
#, c-format
-msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "El desempaquetador elegido se aplica a ambos archivos (s\xF3lo un archivo necesita tener la extensi\xF3n)"
+msgid ""
+"The adapted unpacker is applied to both files (one file only needs the "
+"extension)"
+msgstr ""
+"El desempaquetador elegido se aplica a ambos archivos (s\xF3lo un archivo "
+"necesita tener la extensi\xF3n)"
#: Merge.rc:2672
#, c-format
@@ -5649,7 +5769,9 @@
#: Merge.rc:2690
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
-msgstr "Escribe la informaci\xF3n de la versi\xF3n actual de Winmerge y la configuraci\xF3n a un archivo de texto"
+msgstr ""
+"Escribe la informaci\xF3n de la versi\xF3n actual de Winmerge y la configuraci\xF3n a "
+"un archivo de texto"
#: Merge.rc:2691
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-10 14:50:00
|
Revision: 7607
http://sourceforge.net/p/winmerge/code/7607
Author: christianlist
Date: 2013-03-10 14:49:57 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
[patches:#3027] Winmerge 2.14.0 Spanish Translation Update
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/Languages/Spanish.po
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-10 14:31:00 UTC (rev 7606)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-10 14:49:57 UTC (rev 7607)
@@ -8,6 +8,7 @@
Bugfix: Download link to the 7-zip plugin installer is broken (bugs:#2128)
Translation updates:
- Basque (patches:#3024)
+ - Spanish (patches:#3027)
WinMerge 2.14.0 - 2013-02-02 (r7596)
Bugfix: Shell extension uses unquoted program path (patches:#3023)
Modified: branches/R2_14/Src/Languages/Spanish.po
===================================================================
--- branches/R2_14/Src/Languages/Spanish.po 2013-03-10 14:31:00 UTC (rev 7606)
+++ branches/R2_14/Src/Languages/Spanish.po 2013-03-10 14:49:57 UTC (rev 7607)
@@ -5,6 +5,7 @@
# * Dean Grimm <grimmdp at yahoo.com>
# * Jes\xFAs M. Delgado 'MacK' <nncsoft at yahoo.com>
# * Mario Angel <marioangel70 at gmail.com>
+# * Alberto Cardoso <albercardoso at yahoo.es>
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -14,16 +15,16 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: 2009-02-10 22:14+0000\n"
-"PO-Revision-Date: 2011-09-21 21:52-0300\n"
-"Last-Translator: Mario Angel <marioangel70 at gmail.com>\n"
+"PO-Revision-Date: 2013-02-19 23:31+0100\n"
+"Last-Translator: Alberto Cardoso <albercardoso at yahoo.es>\n"
"Language-Team: Spanish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
"X-Poedit-SourceCharset: CP1252\n"
"X-Poedit-Basepath: ../\n"
-"X-Poedit-Country: ARGENTINA\n"
+"Language: es_AR\n"
+"X-Generator: Poedit 1.5.5\n"
#. LANGUAGE, SUBLANGUAGE
#: Merge.rc:22
@@ -293,12 +294,12 @@
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "Prediferencias Ma&nuales"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "Prediferencias A&utom\xE1ticas"
#: Merge.rc:155
#: Merge.rc:276
@@ -881,7 +882,7 @@
#: Merge.rc:506
#, c-format
msgid "Co&mpare As"
-msgstr ""
+msgstr "Co&mpara como"
#: Merge.rc:508
#, c-format
@@ -891,7 +892,7 @@
#: Merge.rc:509
#, c-format
msgid "&Binary"
-msgstr ""
+msgstr "&Binario"
#: Merge.rc:514
#, c-format
@@ -1342,8 +1343,12 @@
#: Merge.rc:789
#, c-format
-msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge permite ocultar algunos mensajes comunes. Pulse Restablecer para hacer todos los mensajes visibles de nuevo."
+msgid ""
+"WinMerge allows hiding some common messageboxes. Press the Reset button to "
+"make all messageboxes visible again."
+msgstr ""
+"WinMerge permite ocultar algunos mensajes comunes. Pulse Restablecer para "
+"hacer todos los mensajes visibles de nuevo."
#: Merge.rc:791
#, c-format
@@ -2019,7 +2024,9 @@
#: Merge.rc:1253
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr "Seleccione la p\xE1gina de c\xF3digos predeterminada a utilizar cuando se carguen archivos no Unicode:"
+msgstr ""
+"Seleccione la p\xE1gina de c\xF3digos predeterminada a utilizar cuando se carguen "
+"archivos no Unicode:"
#: Merge.rc:1255
#, c-format
@@ -2058,24 +2065,33 @@
#: Merge.rc:1276
#, 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."
+"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 ""
-"El soporte de archivos requiere 7-Zip o posterior instalado en su PC, o sus \n"
-"componentes esenciales copiados en la carpeta del programa para operar en solitario."
+"El soporte de archivos requiere 7-Zip o posterior instalado en su PC, o "
+"sus \n"
+"componentes esenciales copiados en la carpeta del programa para operar en "
+"solitario."
#: Merge.rc:1278
#, c-format
-msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "Adem\xE1s debe haber un plugin de interface apropiado (Merge7z*.dll) en la ruta."
+msgid ""
+"There must also be an appropriate interface plugin (Merge7z*.dll) on the "
+"path."
+msgstr ""
+"Adem\xE1s debe haber un plugin de interface apropiado (Merge7z*.dll) en la ruta."
#: Merge.rc:1280
#, c-format
msgid ""
-"Please use the version of 7-Zip recommended below until interface plugins for later\n"
+"Please use the version of 7-Zip recommended below until interface plugins "
+"for later\n"
"versions become available."
msgstr ""
-"Por favor, use la versi\xF3n de 7-Zip recomendada debajo hasta que haya disponible \n"
+"Por favor, use la versi\xF3n de 7-Zip recomendada debajo hasta que haya "
+"disponible \n"
"una nueva versi\xF3n del plugin de interface."
#: Merge.rc:1282
@@ -2649,12 +2665,12 @@
#: Merge.rc:1681
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "M\xE9todo de &Comparaci\xF3n"
#: Merge.rc:1682
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "Comparaci\xF3n &R\xE1pida l\xEDmite (MB):"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -3080,7 +3096,8 @@
#: Merge.rc:1860
#, c-format
msgid "Close the active window and prompts to save the documents"
-msgstr "Cierra la ventana activa y pregunta al usuario si desea guardar los cambios"
+msgstr ""
+"Cierra la ventana activa y pregunta al usuario si desea guardar los cambios"
#: Merge.rc:1865
#, c-format
@@ -3164,15 +3181,23 @@
#, c-format
msgid ""
"Developers:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi "
+"Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
"Desarrolladores:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi "
+"Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1909
#, 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 General Public License in the Help menu for details."
-msgstr "Winmerge no concede ABSOLUTAMENTE NINGUNA GARANT\xCDA. Es software libre, y puede ser redistribuido bajo ciertas reglas. Vea la Licencia P\xFAblica GNU en el men\xFA Ayuda para m\xE1s detalles."
+msgid ""
+"WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you "
+"are welcome to redistribute it under certain circumstances; see the GNU "
+"General Public License in the Help menu for details."
+msgstr ""
+"Winmerge no concede ABSOLUTAMENTE NINGUNA GARANT\xCDA. Es software libre, y "
+"puede ser redistribuido bajo ciertas reglas. Vea la Licencia P\xFAblica GNU en "
+"el men\xFA Ayuda para m\xE1s detalles."
#: Merge.rc:1915
#, c-format
@@ -3247,7 +3272,7 @@
#: Merge.rc:1946
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "Sintaxis"
#: Merge.rc:1948
#, c-format
@@ -3312,13 +3337,22 @@
#: Merge.rc:1982
#, 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 "Se han realizado modificaciones en los archivos de la sesion de comparaci\xF3n actual. Algunas configuraciones pueden no surtir efecto hasta que la comparaci\xF3n de archivos se ejecute de nuevo."
+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 ""
+"Se han realizado modificaciones en los archivos de la sesion de comparaci\xF3n "
+"actual. Algunas configuraciones pueden no surtir efecto hasta que la "
+"comparaci\xF3n de archivos se ejecute de nuevo."
#: Merge.rc:1983
#, c-format
-msgid "The selected font change will not be applied to any currently visible difference windows."
-msgstr "La fuente seleccionada no se aplicar\xE1 a ninguna de las ventanas de diferencias abiertas actualmente."
+msgid ""
+"The selected font change will not be applied to any currently visible "
+"difference windows."
+msgstr ""
+"La fuente seleccionada no se aplicar\xE1 a ninguna de las ventanas de "
+"diferencias abiertas actualmente."
#: Merge.rc:1985
#, c-format
@@ -3327,7 +3361,8 @@
"\n"
"Please use values 1 - %1."
msgstr ""
-"Valor en Tama\xF1o de Tab - el valor no est\xE1 en el rango aceptado por WinMerge.\n"
+"Valor en Tama\xF1o de Tab - el valor no est\xE1 en el rango aceptado por "
+"WinMerge.\n"
"\n"
"Por favor, utilice valores 1 - %1."
@@ -3338,7 +3373,8 @@
"\n"
"Please re-start WinMerge after the reset."
msgstr ""
-"\xBFDesea restablecer todas las configuraciones de WinMerge a las predeterminadas?\n"
+"\xBFDesea restablecer todas las configuraciones de WinMerge a las "
+"predeterminadas?\n"
"\n"
"Por favor reinicie WinMerge despu\xE9s de restablecer."
@@ -3369,13 +3405,18 @@
#: Merge.rc:2004
#, c-format
-msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-msgstr "Archivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos los archivos (*.*)|*.*||"
+msgid ""
+"Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|"
+"*.*||"
+msgstr ""
+"Archivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos "
+"los archivos (*.*)|*.*||"
#: Merge.rc:2005
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-msgstr "Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||"
+msgstr ""
+"Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||"
#: Merge.rc:2006
#, c-format
@@ -3485,10 +3526,12 @@
"\n"
"Please make sure the folder exists and is writable."
msgstr ""
-"No se pudo copiar el archivo con la plantilla de filtros de archivo a la carpeta:\n"
+"No se pudo copiar el archivo con la plantilla de filtros de archivo a la "
+"carpeta:\n"
"%1\n"
"\n"
-"Por favor, compruebe que la carpeta existe y que tiene permisos de escritura en ella."
+"Por favor, compruebe que la carpeta existe y que tiene permisos de escritura "
+"en ella."
#: Merge.rc:2043
#, c-format
@@ -3545,11 +3588,14 @@
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
"\n"
-"If you do not want to refresh all compares now you can select No and refresh compares later."
+"If you do not want to refresh all compares now you can select No and refresh "
+"compares later."
msgstr ""
-"Los Filtros fueron actualizados. \xBFQuiere actualizar todas comparaciones de carpetas abiertas?\n"
+"Los Filtros fueron actualizados. \xBFQuiere actualizar todas comparaciones de "
+"carpetas abiertas?\n"
"\n"
-"Si no quiere actualizar todas las comparaciones puede elegir No y actualizar las comparaciones despu\xE9s."
+"Si no quiere actualizar todas las comparaciones puede elegir No y actualizar "
+"las comparaciones despu\xE9s."
#: Merge.rc:2069
#, c-format
@@ -3788,8 +3834,12 @@
#: Merge.rc:2148
#, 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 es de s\xF3lo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo con un nuevo nombre.)"
+msgid ""
+"%1 is marked read-only. Would you like to override the read-only file ? (No "
+"to save as new filename.)"
+msgstr ""
+"%1 es de s\xF3lo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo "
+"con un nuevo nombre.)"
#: Merge.rc:2149
#, c-format
@@ -3840,7 +3890,8 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"El Plugin '%2' no pudo empaquetar sus cambios al archivo de la izquierda en '%1'.\n"
+"El Plugin '%2' no pudo empaquetar sus cambios al archivo de la izquierda en "
+"'%1'.\n"
"\n"
"El archivo original no ser\xE1 cambiado.\n"
"\n"
@@ -3855,7 +3906,8 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"El Plugin '%2' no pudo empaquetar sus cambios al archivo de la derecha en '%1'.\n"
+"El Plugin '%2' no pudo empaquetar sus cambios al archivo de la derecha en "
+"'%1'.\n"
"\n"
"El archivo original no ser\xE1 cambiado.\n"
"\n"
@@ -3928,14 +3980,19 @@
"\n"
"Refresh documents before continuing."
msgstr ""
-"No se pueden combinar las diferencias cuando los documentos no est\xE1n sincronizados.\n"
+"No se pueden combinar las diferencias cuando los documentos no est\xE1n "
+"sincronizados.\n"
"\n"
"Actualize los documentos antes de continuar."
#: Merge.rc:2173
#, c-format
-msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
-msgstr "Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/MiProyecto)"
+msgid ""
+"You must specify a SourceSafe project path in order to continue (ie: $/"
+"MyProject)"
+msgstr ""
+"Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/"
+"MiProyecto)"
#: Merge.rc:2174
#, c-format
@@ -3944,8 +4001,12 @@
#: Merge.rc:2175
#, c-format
-msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "El sistema de versionado devolv\xEDo un error mientras trataba de desproteger el archivo. Imposible continuar..."
+msgid ""
+"Versioning System returned an error while attempting to check out the file. "
+"Unable to continue..."
+msgstr ""
+"El sistema de versionado devolv\xEDo un error mientras trataba de desproteger "
+"el archivo. Imposible continuar..."
#: Merge.rc:2176
#, c-format
@@ -3954,8 +4015,12 @@
#: Merge.rc:2177
#, c-format
-msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
-msgstr "La carpeta de trabajo de VSS y la ubicaci\xF3n del archivo actual no coinciden. \xBFContinuar?"
+msgid ""
+"The VSS Working Folder and the location of the current file do not match. "
+"Continue?"
+msgstr ""
+"La carpeta de trabajo de VSS y la ubicaci\xF3n del archivo actual no coinciden. "
+"\xBFContinuar?"
#: Merge.rc:2178
#, c-format
@@ -3974,17 +4039,20 @@
" Please, check config spec of used view.\n"
" Undo checkout operation?"
msgstr ""
-"El sistema de versionado devolvi\xF3 un error cuando se intentaba proteger el archivo.\n"
+"El sistema de versionado devolvi\xF3 un error cuando se intentaba proteger el "
+"archivo.\n"
" Por favor, compruebe la configuraci\xF3n de la vista utilizada.\n"
" \xBFDesea deshacer la desprotecci\xF3n?"
#: Merge.rc:2181
#, c-format
msgid ""
-"Versioning System returned an error while attempting to undo checkout the file.\n"
+"Versioning System returned an error while attempting to undo checkout the "
+"file.\n"
" Please, check config spec of used view. "
msgstr ""
-"El sistema de versionado devolvi\xF3 un error cuando se intentaba deshacer la desprotecci\xF3n del archivo.\n"
+"El sistema de versionado devolvi\xF3 un error cuando se intentaba deshacer la "
+"desprotecci\xF3n del archivo.\n"
" Por favor, compruebe la configuraci\xF3n de la vista utilizada. "
#: Merge.rc:2187
@@ -4583,12 +4651,14 @@
#: Merge.rc:2383
#, c-format
msgid "Left side file version, only for some filetypes."
-msgstr "Versi\xF3n del archivo del lado izquierdo, s\xF3lo para algunos tipos de archivo."
+msgstr ""
+"Versi\xF3n del archivo del lado izquierdo, s\xF3lo para algunos tipos de archivo."
#: Merge.rc:2384
#, c-format
msgid "Right side file version, only for some filetypes."
-msgstr "Versi\xF3n del archivo del lado derecho, s\xF3lo para algunos tipos de archivo."
+msgstr ""
+"Versi\xF3n del archivo del lado derecho, s\xF3lo para algunos tipos de archivo."
#: Merge.rc:2385
#, c-format
@@ -4627,13 +4697,21 @@
#: Merge.rc:2397
#, c-format
-msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr "N\xFAmero de diferencias ignoradas en el archivo. Estas diferencias son ignoradas por WinMerge y no se pueden combinar."
+msgid ""
+"Number of ignored differences in file. These differences are ignored by "
+"WinMerge and cannot be merged."
+msgstr ""
+"N\xFAmero de diferencias ignoradas en el archivo. Estas diferencias son "
+"ignoradas por WinMerge y no se pueden combinar."
#: Merge.rc:2398
#, c-format
-msgid "Number of differences in file. This number does not include ignored differences."
-msgstr "N\xFAmero de diferencias en el archivo. Este n\xFAmero no incluye las diferencias ignoradas."
+msgid ""
+"Number of differences in file. This number does not include ignored "
+"differences."
+msgstr ""
+"N\xFAmero de diferencias en el archivo. Este n\xFAmero no incluye las diferencias "
+"ignoradas."
#: Merge.rc:2399
#, c-format
@@ -4701,23 +4779,33 @@
#: Merge.rc:2422
#, c-format
-msgid "Temporary files could not be created. Check your temporary path settings."
-msgstr "Los archivos temporales no se pudieron crear. Compruebe su ruta para archivos temporales."
+msgid ""
+"Temporary files could not be created. Check your temporary path settings."
+msgstr ""
+"Los archivos temporales no se pudieron crear. Compruebe su ruta para "
+"archivos temporales."
#: Merge.rc:2423
#, c-format
msgid ""
"These files use different carriage return types.\n"
"\n"
-"Do you want to treat all carriage return types as equivalent for this comparison?\n"
+"Do you want to treat all carriage return types as equivalent for this "
+"comparison?\n"
"\n"
-"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)."
+"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 ""
"Estos archivos utilizan tipos diferentes de salto de l\xEDnea.\n"
"\n"
-"\xBFDesea tratar todos los tipos de salto de l\xEDnea como equivalentes para esta comparaci\xF3n?\n"
+"\xBFDesea tratar todos los tipos de salto de l\xEDnea como equivalentes para esta "
+"comparaci\xF3n?\n"
"\n"
-"Nota: si desea tratar siempre todos los tipos de saltos de l\xEDnea como equivalentes, seleccione la opci\xF3n 'Ignorar saltos de l\xEDnea diferentes..' en la pesta\xF1a Comparar del dialogo Configuraci\xF3n (disponible en Editar/Configuraci\xF3n)."
+"Nota: si desea tratar siempre todos los tipos de saltos de l\xEDnea como "
+"equivalentes, seleccione la opci\xF3n 'Ignorar saltos de l\xEDnea diferentes..' en "
+"la pesta\xF1a Comparar del dialogo Configuraci\xF3n (disponible en Editar/"
+"Configuraci\xF3n)."
#: Merge.rc:2424
#, c-format
@@ -4732,8 +4820,12 @@
#: Merge.rc:2425
#, c-format
-msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
-msgstr "Ocurri\xF3 un error mientras se precomparaba el archivo '%1' con el plugin '%2'. La precomparaci\xF3n no ser\xE1 aplicada de nuevo."
+msgid ""
+"An error occurred while prediffing the file '%1' with the plugin '%2'. The "
+"prediffing is not applied any more."
+msgstr ""
+"Ocurri\xF3 un error mientras se precomparaba el archivo '%1' con el plugin "
+"'%2'. La precomparaci\xF3n no ser\xE1 aplicada de nuevo."
#: Merge.rc:2426
#, c-format
@@ -4764,17 +4856,26 @@
#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files. \n"
-"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
-"Would you like to treat both files as being in the default windows codepage (recommended)?"
+"Displaying each file in its codepage will give a better display but merging/"
+"copying will be dangerous.\n"
+"Would you like to treat both files as being in the default windows codepage "
+"(recommended)?"
msgstr ""
-"Las p\xE1ginas de c\xF3digos son diferentes en el archivo de la izquierda (cp%d) y el de la derecha (cp%d). \n"
-"Mostrar cada archivo en su p\xE1gina de c\xF3digos dar\xE1 una mejor visualizaci\xF3n, pero combinar/copiar ser\xEDa peligroso.\n"
-"\xBFLe gustar\xEDa tratar ambos archivos con la p\xE1gina de c\xF3digos predeterminada de windows (recomendado)?"
+"Las p\xE1ginas de c\xF3digos son diferentes en el archivo de la izquierda (cp%d) y "
+"el de la derecha (cp%d). \n"
+"Mostrar cada archivo en su p\xE1gina de c\xF3digos dar\xE1 una mejor visualizaci\xF3n, "
+"pero combinar/copiar ser\xEDa peligroso.\n"
+"\xBFLe gustar\xEDa tratar ambos archivos con la p\xE1gina de c\xF3digos predeterminada "
+"de windows (recomendado)?"
#: Merge.rc:2435
#, c-format
-msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
-msgstr "Atenci\xF3n: los archivos utilizan codificaciones diferentes, izquierdo=%s y derecho=%s, y la combinaci\xF3n podr\xEDa provocar perdida de informaci\xF3n."
+msgid ""
+"Warning: Files use different encodings, left=%s and right=%s, and merging "
+"may lead to information loss."
+msgstr ""
+"Atenci\xF3n: los archivos utilizan codificaciones diferentes, izquierdo=%s y "
+"derecho=%s, y la combinaci\xF3n podr\xEDa provocar perdida de informaci\xF3n."
#: Merge.rc:2436
#, c-format
@@ -4789,7 +4890,8 @@
#: Merge.rc:2438
#, c-format
msgid "Information lost due to encoding errors: left file"
-msgstr "Informaci\xF3n perdida debido a errores de codificaci\xF3n: archivo izquierdo"
+msgstr ""
+"Informaci\xF3n perdida debido a errores de codificaci\xF3n: archivo izquierdo"
#: Merge.rc:2444
#, c-format
@@ -4889,7 +4991,8 @@
#: Merge.rc:2483
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "No se puede crear un archivo de correcci\xF3n a partir de un archivo binario."
+msgstr ""
+"No se puede crear un archivo de correcci\xF3n a partir de un archivo binario."
#: Merge.rc:2484
#, c-format
@@ -4905,7 +5008,8 @@
msgstr ""
"Por favor, guarde todos los archivos antes.\n"
"\n"
-"Crear una correcci\xF3n requiere que no haya cambios pendientes de ser guardados."
+"Crear una correcci\xF3n requiere que no haya cambios pendientes de ser "
+"guardados."
#: Merge.rc:2486
#, c-format
@@ -4921,12 +5025,15 @@
#, c-format
msgid ""
"Archive support is not enabled.\n"
-"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
+"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot "
+"be found.\n"
"See manual for more info about archive support and how to enable it."
msgstr ""
"El soporte de archivos no est\xE1 habilitado.\n"
-"Los componentes necesarios(7-zip y/o Merge7z*.dll) para el archivo no est\xE1n disponibles.\n"
-"Vea el manual para m\xE1s informaci\xF3n acerca del soporte de archivos y c\xF3mo habilitarlo."
+"Los componentes necesarios(7-zip y/o Merge7z*.dll) para el archivo no est\xE1n "
+"disponibles.\n"
+"Vea el manual para m\xE1s informaci\xF3n acerca del soporte de archivos y c\xF3mo "
+"habilitarlo."
#: Merge.rc:2493
#, c-format
@@ -4935,16 +5042,19 @@
"Note: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
"\n"
-"Nota: La integraci\xF3n con 7-Zip est\xE1 deshabilitada en la configuracion de WinMerge."
+"Nota: La integraci\xF3n con 7-Zip est\xE1 deshabilitada en la configuracion de "
+"WinMerge."
#: Merge.rc:2494
#, c-format
msgid ""
"\n"
-"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
+"Note: 7-Zip integration is restricted to standalone operation in WinMerge "
+"settings."
msgstr ""
"\n"
-"Nota: La integraci\xF3n con 7-Zip est\xE1 restringida a operaci\xF3n en solitario en la configuracion de WinMerge."
+"Nota: La integraci\xF3n con 7-Zip est\xE1 restringida a operaci\xF3n en solitario en "
+"la configuracion de WinMerge."
#: Merge.rc:2495
#, c-format
@@ -5260,7 +5370,9 @@
#: Merge.rc:2590
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
-msgstr "Copiar las l\xEDneas seleccionadas al portapapeles a\xF1adiendo n\xFAmeros de l\xEDnea al principio de cada una de ellas"
+msgstr ""
+"Copiar las l\xEDneas seleccionadas al portapapeles a\xF1adiendo n\xFAmeros de l\xEDnea "
+"al principio de cada una de ellas"
#: Merge.rc:2591
#, c-format
@@ -5551,7 +5663,9 @@
#: Merge.rc:2644
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
-msgstr "Compara el elemento seleccionado (compara el primero si hay m\xFAltiples elementos seleccionados)"
+msgstr ""
+"Compara el elemento seleccionado (compara el primero si hay m\xFAltiples "
+"elementos seleccionados)"
#: Merge.rc:2650
#, c-format
@@ -5581,12 +5695,18 @@
#: Merge.rc:2660
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
-msgstr "El usuario selecciona el desempaquetador (no se desempaqueta cuando se comparan carpetas)"
+msgstr ""
+"El usuario selecciona el desempaquetador (no se desempaqueta cuando se "
+"comparan carpetas)"
#: Merge.rc:2661
#, c-format
-msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "El desempaquetador elegido se aplica a ambos archivos (s\xF3lo un archivo necesita tener la extensi\xF3n)"
+msgid ""
+"The adapted unpacker is applied to both files (one file only needs the "
+"extension)"
+msgstr ""
+"El desempaquetador elegido se aplica a ambos archivos (s\xF3lo un archivo "
+"necesita tener la extensi\xF3n)"
#: Merge.rc:2662
#, c-format
@@ -5639,7 +5759,9 @@
#: Merge.rc:2680
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
-msgstr "Escribe la informaci\xF3n de la versi\xF3n actual de Winmerge y la configuraci\xF3n a un archivo de texto"
+msgstr ""
+"Escribe la informaci\xF3n de la versi\xF3n actual de Winmerge y la configuraci\xF3n a "
+"un archivo de texto"
#: Merge.rc:2681
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-03-10 14:31:04
|
Revision: 7606
http://sourceforge.net/p/winmerge/code/7606
Author: christianlist
Date: 2013-03-10 14:31:00 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
[patches:#3026] Improved WiX installer
This patch has quite a few changes in it:
There are lots of whitespace changes. I think these are from Visual Studio, when I edit the xml files it reformats them for me. These changes can of course be ignored.
Upgraded WiX from 3.5 to 3.6.
WiX 3.7 was released recently, so I may go ahead and update to 3.7 before long.
Used Visual Studio 2010 as the compiler. WiX itself isn't dependent on the Visual Studio version, so we might as well use the version that's most convenient.
Changed a few paths in Config.wxi, they now point to where WinMergeX64.sln actually puts them.
Split the ShellExtension feature out into it's own ShellExtension.wxs file. The ShellExtension is most likely the component that will give us the most headache for this installer, so having it in it's own file is good.
Used the UtilExentension to add support for the RestartManager. This let's the installer prompt the user to have a choice between closing Windows Explorer or restarting the computer after installation.
Changed the shortcut registry entries to be unique. They have to be unique, otherwise there will be uninstall problems.
Add detection for InnoSetup installers present on the machine already, and quitly unistalling those prior to installing the WiX installer.
This may only be needed in the 32 bit version. But I left it in there for both version for now.
Fixed the Windows version detection, so it now actually works.
Added some additional properties to the Add/Remove Programs entry, to give users a little more information.
Created the first inital version of a build script for the WiX setup BuildWiXInstaller.bat. It's very rudimentary right now, but at least it's there.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/WiX/Config.wxi
trunk/Installer/WiX/Fragments/Core.wxs
trunk/Installer/WiX/Fragments/Features.wxs
trunk/Installer/WiX/WinMerge.wixproj
trunk/Installer/WiX/WinMerge.wxs
Added Paths:
-----------
trunk/Installer/WiX/Fragments/ShellExtension.wxs
trunk/Tools/Scripts/BuildWiXInstaller.bat
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2013-03-10 13:07:51 UTC (rev 7605)
+++ trunk/Docs/Users/ChangeLog.txt 2013-03-10 14:31:00 UTC (rev 7606)
@@ -10,6 +10,7 @@
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
Installer: Add support for TortoiseGit (patches:#3016)
+ Installer: Improved WiX installer (patches:#3026)
Bugfix: No menu icons was shown on Windows x64 (#3070151)
Bugfix: Crash when pasting from clipboard (#3109525)
Bugfix: Keeps verifing path even turned off in options (#3111581)
Modified: trunk/Installer/WiX/Config.wxi
===================================================================
--- trunk/Installer/WiX/Config.wxi 2013-03-10 13:07:51 UTC (rev 7605)
+++ trunk/Installer/WiX/Config.wxi 2013-03-10 14:31:00 UTC (rev 7606)
@@ -19,9 +19,9 @@
<?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?>
<?define ProgramFilesFolder = "ProgramFiles64Folder" ?>
- <?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?>
+ <?define MergeBuildDir = "..\..\Build\x64\MergeUnicodeRelease" ?>
<?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?>
- <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?>
+ <?define PcreBuildDir = "..\..\Build\pcre\x64\Release" ?>
<?define ShellExtBuildDir = "..\..\Build\ShellExtension\x64 release" ?>
<?define StartMenuShortcutsGuid = "CDC49AA0-DC37-439d-8358-68E2EA9EF909" ?>
Modified: trunk/Installer/WiX/Fragments/Core.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Core.wxs 2013-03-10 13:07:51 UTC (rev 7605)
+++ trunk/Installer/WiX/Fragments/Core.wxs 2013-03-10 14:31:00 UTC (rev 7606)
@@ -1,100 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<?include ..\Config.wxi ?>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)">
- <File Id="WinMergeUEXE"
- Name="WinMergeU.exe"
- Source="$(var.MergeBuildDir)\WinMergeU.exe"
+ <File Id="WinMergeUEXE"
+ Name="WinMergeU.exe"
+ Source="$(var.MergeBuildDir)\WinMergeU.exe"
Vital="yes" />
</Component>
-
+
<Component Id="libexpat" Guid="*" Win64="$(var.Win64)">
- <File Id="libexpatDLL"
- Name="libexpat.dll"
- Source="$(var.ExpatBuildDir)\libexpat.dll"
+ <File Id="libexpatDLL"
+ Name="libexpat.dll"
+ Source="$(var.ExpatBuildDir)\libexpat.dll"
Vital="yes" />
</Component>
-
+
<Component Id="pcre" Guid="*" Win64="$(var.Win64)">
- <File Id="pcreDLL"
- Name="pcre.dll"
- Source="$(var.PcreBuildDir)\pcre.dll"
+ <File Id="pcreDLL"
+ Name="pcre.dll"
+ Source="$(var.PcreBuildDir)\pcre.dll"
Vital="yes" />
</Component>
-
+
<Component Id="MergeLang" Guid="*" Win64="$(var.Win64)">
- <File Id="MergeLangDLL"
- Name="MergeLang.dll"
- Source="$(var.MergeBuildDir)\MergeLang.dll"
+ <File Id="MergeLangDLL"
+ Name="MergeLang.dll"
+ Source="$(var.MergeBuildDir)\MergeLang.dll"
Vital="yes" />
</Component>
-
+
<Component Id="Files" Guid="*" Win64="$(var.Win64)">
- <File Id="FilesTXT"
- Name="Files.txt"
- Source="..\..\Docs\Users\Files.txt"
+ <File Id="FilesTXT"
+ Name="Files.txt"
+ Source="..\..\Docs\Users\Files.txt"
Vital="no" />
</Component>
-
+
<Component Id="Contributors" Guid="*" Win64="$(var.Win64)">
- <File Id="ContributorsTXT"
- Name="Contributors.txt"
- Source="..\..\Docs\Users\Contributors.txt"
+ <File Id="ContributorsTXT"
+ Name="Contributors.txt"
+ Source="..\..\Docs\Users\Contributors.txt"
Vital="no" />
</Component>
+
</DirectoryRef>
-
- <!-- Shell Extension -->
- <DirectoryRef Id="INSTALLDIR">
- <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)">
- <?if $(var.Platform) = "x64" ?>
- <File Id="ShellExtensionX64DLL"
- Name="ShellExtensionX64.dll"
- SelfRegCost="1"
- Source="$(var.ShellExtBuildDir)\ShellExtensionX64.dll"
- Vital="yes" />
- <?else ?>
- <File Id="ShellExtensionUDLL"
- Name="ShellExtensionU.dll"
- SelfRegCost="1"
- Source="$(var.ShellExtBuildDir)\ShellExtensionU.dll"
- Vital="yes" />
- <?endif ?>
- </Component>
- </DirectoryRef>
-
+
<!-- Startmenu shortcuts -->
<DirectoryRef Id="WinMergeMenuFolder">
<Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)">
<Condition>TASK_STARTMENUSHORTCUTS</Condition>
- <Shortcut Id="WinMergeStartMenuShortcut"
- Name="WinMerge"
+ <Shortcut Id="WinMergeStartMenuShortcut"
+ Name="WinMerge"
Target="[INSTALLDIR]WinMergeU.exe"
WorkingDirectory="INSTALLDIR" />
- <Shortcut Id="ReadMeStartMenuShortcut"
- Name="Read Me"
+ <Shortcut Id="ReadMeStartMenuShortcut"
+ Name="Read Me"
Target="[INSTALLDIR]Docs\ReadMe.txt"
WorkingDirectory="INSTALLDIR" />
- <Shortcut Id="HelpStartMenuShortcut"
- Name="WinMerge Help"
+ <Shortcut Id="HelpStartMenuShortcut"
+ Name="WinMerge Help"
Target="[INSTALLDIR]Docs\WinMerge.chm"
WorkingDirectory="INSTALLDIR" />
<RemoveFolder Id="WinMergeMenuFolder" On="uninstall" />
- <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
+ <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge\Installation" Name="StartMenuShortcuts" Type="integer" Value="1" KeyPath="yes" />
</Component>
</DirectoryRef>
-
+
<!-- Desktop shortcut -->
<DirectoryRef Id="DesktopFolder">
<Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)">
<Condition>TASK_DESKTOPSHORTCUT</Condition>
- <Shortcut Id="WinMergeDesktopShortcut"
- Name="WinMerge"
+ <Shortcut Id="WinMergeDesktopShortcut"
+ Name="WinMerge"
Target="[INSTALLDIR]WinMergeU.exe"
WorkingDirectory="INSTALLDIR" />
- <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
+ <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge\Installation" Name="DesktopShortcut" Type="integer" Value="1" KeyPath="yes" />
</Component>
</DirectoryRef>
</Fragment>
Modified: trunk/Installer/WiX/Fragments/Features.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Features.wxs 2013-03-10 13:07:51 UTC (rev 7605)
+++ trunk/Installer/WiX/Fragments/Features.wxs 2013-03-10 14:31:00 UTC (rev 7606)
@@ -19,13 +19,8 @@
<ComponentRef Id="MergeLang" />
<ComponentRef Id="StartMenuShortcuts" />
<ComponentRef Id="DesktopShortcut" />
- <Feature Id="ShellExtension"
- AllowAdvertise="no"
- Description="Explorer context menu integration"
- Level="1"
- Title="Shell Extension">
- <ComponentRef Id="ShellExtension" />
- </Feature>
+ <FeatureRef Id="ShellExtension" />
+
<Feature Id="Documentation" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Documentation">
<ComponentRef Id="Files" />
<ComponentRef Id="Contributors" />
Added: trunk/Installer/WiX/Fragments/ShellExtension.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/ShellExtension.wxs (rev 0)
+++ trunk/Installer/WiX/Fragments/ShellExtension.wxs 2013-03-10 14:31:00 UTC (rev 7606)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+ <?include ..\Config.wxi ?>
+ <Fragment>
+ <Feature Id="ShellExtension" AllowAdvertise="no" Description="Explorer context menu integration"
+ Level="1" Title="Shell Extension">
+ <Component Id="ShellExtension" Directory="INSTALLDIR" Guid="*" Win64="$(var.Win64)">
+ <?if $(var.Platform) = "x64" ?>
+ <File Id="ShellExtensionX64DLL"
+ Name="ShellExtensionX64.dll"
+ SelfRegCost="1"
+ Source="$(var.ShellExtBuildDir)\ShellExtensionX64.dll"
+ Vital="yes" />
+ <!--Do not include the 32 bit file in 64 bit package-->
+ <?else ?>
+
+ <File Id="ShellExtensionUDLL"
+ Name="ShellExtensionU.dll"
+ SelfRegCost="1"
+ Source="$(var.ShellExtBuildDir)\ShellExtensionU.dll"
+ Vital="yes" />
+ <?endif ?>
+ <util:RestartResource ProcessName="explorer.exe" />
+ </Component>
+ </Feature>
+ </Fragment>
+</Wix>
\ No newline at end of file
Modified: trunk/Installer/WiX/WinMerge.wixproj
===================================================================
--- trunk/Installer/WiX/WinMerge.wixproj 2013-03-10 13:07:51 UTC (rev 7605)
+++ trunk/Installer/WiX/WinMerge.wixproj 2013-03-10 14:31:00 UTC (rev 7606)
@@ -1,31 +1,47 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<DefineSolutionProperties>false</DefineSolutionProperties>
-
- <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3.5\bin\</WixToolPath>
+ <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\WiX Toolset v3.6\bin\</WixToolPath>
<WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-
+ <ProductVersion>1.2.3</ProductVersion>
<OutputName Condition=" '$(ProductVersion)' != '' ">WinMerge-$(ProductVersion)-$(Platform)-Setup</OutputName>
<OutputName Condition=" '$(ProductVersion)' == '' ">WinMerge-$(Platform)-Setup</OutputName>
<OutputPath>..\..\Build\WiX\$(Configuration)\$(Platform)\</OutputPath>
<IntermediateOutputPath>..\..\BuildTmp\WiX\$(Configuration)\$(Platform)\</IntermediateOutputPath>
<OutputType>package</OutputType>
+ <ProjectGuid>{cec830a7-1d3b-4558-be94-48a390ef894b}</ProjectGuid>
</PropertyGroup>
-
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <DefineConstants>
+ </DefineConstants>
+ </PropertyGroup>
<ItemGroup>
- <WixExtension Include="$(WixToolPath)WixUIExtension.dll" />
- <Compile Include="WinMerge.wxs"/>
- <Compile Include="Fragments\Core.wxs"/>
- <Compile Include="Fragments\Docs.wxs"/>
- <Compile Include="Fragments\Filters.wxs"/>
- <Compile Include="Fragments\Languages.wxs"/>
- <Compile Include="Fragments\Features.wxs"/>
- <Compile Include="Fragments\WixUI_WinMerge.wxs"/>
- <Compile Include="Fragments\WixUI_AdditionalTasksDlg.wxs"/>
+ <WixExtension Include="WixUIExtension">
+ <HintPath>C:\Program Files (x86)\WiX Toolset v3.6\bin\WixUIExtension.dll</HintPath>
+ <Name>WixUIExtension</Name>
+ </WixExtension>
+ <WixExtension Include="WixUtilExtension">
+ <HintPath>C:\Program Files (x86)\WiX Toolset v3.6\bin\WixUtilExtension.dll</HintPath>
+ <Name>WixUtilExtension</Name>
+ </WixExtension>
+ <Compile Include="Fragments\ShellExtension.wxs" />
+ <Compile Include="WinMerge.wxs" />
+ <Compile Include="Fragments\Core.wxs" />
+ <Compile Include="Fragments\Docs.wxs" />
+ <Compile Include="Fragments\Filters.wxs" />
+ <Compile Include="Fragments\Languages.wxs" />
+ <Compile Include="Fragments\Features.wxs" />
+ <Compile Include="Fragments\WixUI_WinMerge.wxs" />
+ <Compile Include="Fragments\WixUI_AdditionalTasksDlg.wxs" />
</ItemGroup>
-
- <Import Project="$(WixTargetsPath)"/>
-</Project>
+ <ItemGroup>
+ <Folder Include="Fragments\" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="Config.wxi" />
+ </ItemGroup>
+ <Import Project="$(WixTargetsPath)" />
+</Project>
\ No newline at end of file
Modified: trunk/Installer/WiX/WinMerge.wxs
===================================================================
--- trunk/Installer/WiX/WinMerge.wxs 2013-03-10 13:07:51 UTC (rev 7605)
+++ trunk/Installer/WiX/WinMerge.wxs 2013-03-10 14:31:00 UTC (rev 7606)
@@ -3,7 +3,7 @@
candleArgs: "WinMerge.wxs" "Fragments\Core.wxs" "Fragments\Docs.wxs" "Fragments\Filters.wxs" "Fragments\Languages.wxs" "Fragments\Features.wxs" "Fragments\WixUI_WinMerge.wxs" "Fragments\WixUI_AdditionalTasksDlg.wxs" <extensions>
lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" "WixUI_AdditionalTasksDlg.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions>
-->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<?include Config.wxi ?>
<!--
TODO:
@@ -12,6 +12,7 @@
* Quick Launch
* Integrate to...
* TortoiseCVS
+ * TortoiseGit
* TortoiseSVN
* ClearCase
* Modify Path
@@ -37,7 +38,8 @@
Languages="1033"
Manufacturer="$(var.PackageDescription)"
Platform="$(var.PackagePlatform)"
- SummaryCodepage="1252" />
+ SummaryCodepage="1252"
+ InstallScope="perMachine" />
<Media Id="1"
Cabinet="winmerge.cab"
@@ -63,23 +65,44 @@
<Property Id="TASK_STARTMENUSHORTCUTS">1</Property>
<Property Id="TASK_DESKTOPSHORTCUT">1</Property>
+ <!--Search the registry for WinMerge version 2.14 or older.
+ These versions where installed using InnoSetup and requires a special executable to be executed to uninstall-->
+ <Property Id="UNINSTALLINNOSETUP">
+ <RegistrySearch Id="UninstallInnoSetup" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinMerge_is1" Name="QuietUninstallString" Type="raw"/>
+ </Property>
+
+ <!--Set the command line to be executed in a CustomAction-->
+ <SetProperty Id="QtExecCmdLine" Value="[UNINSTALLINNOSETUP]" After="AppSearch"/>
+ <CustomAction Id="UninstallInnoSetupCA" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="immediate" Return="check"/>
+
+ <InstallExecuteSequence>
+ <!--Execute the CustomAction to uninstall the old InnoSetup based installer-->
+ <Custom Action="UninstallInnoSetupCA" After="InstallInitialize" >
+ <![CDATA[(NOT Installed) OR UNINSTALLINNOSETUP]]>
+ </Custom>
+ </InstallExecuteSequence>
+
+
<FeatureRef Id="WinMerge" />
- <!-- TODO: Works this really? -->
- <Condition Message="WinMerge requires Windows 2000/XP/2003/Vista/2008 or later to install.">
- <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]>
+ <Condition Message="WinMerge requires Windows 2000/XP/2003/Vista/2008/7/8/2012 or later to install.">
+ <![CDATA[Installed OR (VersionNT >= 500)]]>
</Condition>
<WixVariable Id="WixUILicenseRtf" Value="..\..\Docs\users\GPL.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="Bitmaps\banner.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="Bitmaps\dialog.bmp" />
+ <!--Some properties to set on Add/Remove Programs (ARP)-->
<Icon Id="Merge.ico" SourceFile="..\..\Src\res\Merge.ico"/>
<Property Id="ARPPRODUCTICON" Value="Merge.ico" />
+ <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize"/>
+ <Property Id="ARPURLINFOABOUT" Value="http://WinMerge.org" />
+ <Property Id="ARPHELPLINK" Value="http://WinMerge.org" />
+ <Property Id="ARPURLUPDATEINFO" Value="http://WinMerge.org/" />
+ <SetProperty Id="ARPREADME" Value="[DOCSDIR]ReadMe.txt" After="CostFinalize"/>
<UIRef Id="WixUI_WinMerge" />
- <UI />
-
</Product>
</Wix>
Added: trunk/Tools/Scripts/BuildWiXInstaller.bat
===================================================================
--- trunk/Tools/Scripts/BuildWiXInstaller.bat (rev 0)
+++ trunk/Tools/Scripts/BuildWiXInstaller.bat 2013-03-10 14:31:00 UTC (rev 7606)
@@ -0,0 +1,4 @@
+call "%VS100COMNTOOLS%vsvars32.bat"
+
+msbuild.exe ../../Installer/WiX/WinMerge.wixproj /p:Platform=x86
+msbuild.exe ../../Installer/WiX/WinMerge.wixproj /p:Platform=x64
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2013-03-10 13:07:55
|
Revision: 7605
http://sourceforge.net/p/winmerge/code/7605
Author: gerundt
Date: 2013-03-10 13:07:51 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
Bugfix: Download link to the 7-zip plugin installer is broken (bugs:#2128)
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/7zCommon.cpp
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-10 13:07:20 UTC (rev 7604)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-10 13:07:51 UTC (rev 7605)
@@ -5,6 +5,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.14.2
+ Bugfix: Download link to the 7-zip plugin installer is broken (bugs:#2128)
Translation updates:
- Basque (patches:#3024)
Modified: branches/R2_14/Src/7zCommon.cpp
===================================================================
--- branches/R2_14/Src/7zCommon.cpp 2013-03-10 13:07:20 UTC (rev 7604)
+++ branches/R2_14/Src/7zCommon.cpp 2013-03-10 13:07:51 UTC (rev 7605)
@@ -225,7 +225,7 @@
/**
* @brief Download URL for C7ZipMismatchException's ReportError() popup.
*/
-const TCHAR C7ZipMismatchException::m_strDownloadURL[] = _T("https://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957");
+const TCHAR C7ZipMismatchException::m_strDownloadURL[] = _T("http://sourceforge.net/projects/winmerge/files/7-zip-plugin/");
/**
* @brief Retrieve build number of given DLL.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2013-03-10 13:07:23
|
Revision: 7604
http://sourceforge.net/p/winmerge/code/7604
Author: gerundt
Date: 2013-03-10 13:07:20 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
Bugfix: Download link to the 7-zip plugin installer is broken (bugs:#2128)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/7zCommon.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2013-03-07 10:19:35 UTC (rev 7603)
+++ trunk/Docs/Users/ChangeLog.txt 2013-03-10 13:07:20 UTC (rev 7604)
@@ -21,6 +21,7 @@
Bugfix: WinMerge contained a vulnerability in handling project files (#3185386)
(http://www.zeroscience.mk/mk/vulnerabilities/ZSL-2011-4997.php)
Bugfix: Shell extension uses unquoted program path (patches:#3023)
+ Bugfix: Download link to the 7-zip plugin installer is broken (bugs:#2128)
New translations:
- Basque (#3387142, patches:#3024)
- Turkish (patches:#2967)
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2013-03-07 10:19:35 UTC (rev 7603)
+++ trunk/Src/7zCommon.cpp 2013-03-10 13:07:20 UTC (rev 7604)
@@ -225,7 +225,7 @@
/**
* @brief Download URL for C7ZipMismatchException's ReportError() popup.
*/
-const TCHAR C7ZipMismatchException::m_strDownloadURL[] = _T("https://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957");
+const TCHAR C7ZipMismatchException::m_strDownloadURL[] = _T("http://sourceforge.net/projects/winmerge/files/7-zip-plugin/");
/**
* @brief Retrieve build number of given DLL.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2013-03-07 10:19:37
|
Revision: 7603
http://sourceforge.net/p/winmerge/code/7603
Author: gerundt
Date: 2013-03-07 10:19:35 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
Change Filters/readme.txt and Plugins/readme.txt to readme.md
Added Paths:
-----------
trunk/Filters/readme.md
trunk/Plugins/readme.md
Removed Paths:
-------------
trunk/Filters/readme.txt
trunk/Plugins/readme.txt
Copied: trunk/Filters/readme.md (from rev 7601, trunk/Filters/readme.txt)
===================================================================
--- trunk/Filters/readme.md (rev 0)
+++ trunk/Filters/readme.md 2013-03-07 10:19:35 UTC (rev 7603)
@@ -0,0 +1,10 @@
+Filters
+=======
+
+Filters holds the WinMerge runtime file filters.
+
+These allow the user to only diff certain types of files, or to exclude
+certain types of files from directory diffs.
+
+These filters are distributed in the Filters
+subdirectory beneath the WinMerge executables.
Deleted: trunk/Filters/readme.txt
===================================================================
--- trunk/Filters/readme.txt 2013-03-07 10:05:28 UTC (rev 7602)
+++ trunk/Filters/readme.txt 2013-03-07 10:19:35 UTC (rev 7603)
@@ -1,9 +0,0 @@
-WinMerge/Filters/readme.txt
-
-Filters holds the WinMerge runtime file filters.
-
-These allow the user to only diff certain types of files, or to exclude
-certain types of files from directory diffs.
-
-These filters are distributed in the Filters
-subdirectory beneath the WinMerge executables.
Copied: trunk/Plugins/readme.md (from rev 7601, trunk/Plugins/readme.txt)
===================================================================
--- trunk/Plugins/readme.md (rev 0)
+++ trunk/Plugins/readme.md 2013-03-07 10:19:35 UTC (rev 7603)
@@ -0,0 +1,10 @@
+Plugins
+=======
+
+Plugins holds the WinMerge runtime plugins, source code and binaries both.
+
+These plugins allow transformations to files before diffing, or during
+editing. See the manual for more information.
+
+These filters are distributed in the MergePlugins
+subdirectory beneath the WinMerge executables.
Deleted: trunk/Plugins/readme.txt
===================================================================
--- trunk/Plugins/readme.txt 2013-03-07 10:05:28 UTC (rev 7602)
+++ trunk/Plugins/readme.txt 2013-03-07 10:19:35 UTC (rev 7603)
@@ -1,9 +0,0 @@
-WinMerge/Plugins/readme.txt
-
-Plugins holds the WinMerge runtime plugins, source code and binaries both.
-
-These plugins allow transformations to files before diffing, or during
-editing. See the manual for more information.
-
-These filters are distributed in the MergePlugins
-subdirectory beneath the WinMerge executables.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2013-03-07 10:05:32
|
Revision: 7602
http://sourceforge.net/p/winmerge/code/7602
Author: gerundt
Date: 2013-03-07 10:05:28 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
Change Externals/versions.txt to a README with Markdown syntax (SF.net and Bitbucket will show it by code browsing)
Added Paths:
-----------
trunk/Externals/readme.md
Removed Paths:
-------------
trunk/Externals/versions.txt
Copied: trunk/Externals/readme.md (from rev 7601, trunk/Externals/versions.txt)
===================================================================
--- trunk/Externals/readme.md (rev 0)
+++ trunk/Externals/readme.md 2013-03-07 10:05:28 UTC (rev 7602)
@@ -0,0 +1,16 @@
+Externals
+=========
+
+This folder contains several libraries whose sources come from
+outside WinMerge project. They are stored here for convenience for
+building and possible needed small changes for WinMerge. Libraries
+include XML parser and regular expression parser.
+
+Versions
+--------
+
+We are using this versions of the external components:
+
+* Expat = 2.0.1
+* PCRE = 8.10
+* SCEW = 1.1.2
Deleted: trunk/Externals/versions.txt
===================================================================
--- trunk/Externals/versions.txt 2013-03-06 23:23:15 UTC (rev 7601)
+++ trunk/Externals/versions.txt 2013-03-07 10:05:28 UTC (rev 7602)
@@ -1,8 +0,0 @@
-Versions of external components
--------------------------------
-
-This file lists versions of the external components we are using.
-
-Expat: 2.0.1
-PCRE: 8.10
-SCEW: 1.1.2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2013-03-06 23:23:18
|
Revision: 7601
http://sourceforge.net/p/winmerge/code/7601
Author: gerundt
Date: 2013-03-06 23:23:15 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
Remove unused files
Submitted by Takashi Sawanaka
Modified Paths:
--------------
trunk/Src/ConfigLog.cpp
Removed Paths:
-------------
trunk/Src/STACK.C
trunk/Src/ssauto.h
trunk/Src/winnt_supp.h
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2013-03-06 22:57:49 UTC (rev 7600)
+++ trunk/Src/ConfigLog.cpp 2013-03-06 23:23:15 UTC (rev 7601)
@@ -28,7 +28,6 @@
#include "UniFile.h"
#include "DiffWrapper.h"
#include "ConfigLog.h"
-#include "winnt_supp.h"
#include "Plugins.h"
#include "paths.h"
#include "unicoder.h"
Deleted: trunk/Src/STACK.C
===================================================================
--- trunk/Src/STACK.C 2013-03-06 22:57:49 UTC (rev 7600)
+++ trunk/Src/STACK.C 2013-03-06 23:23:15 UTC (rev 7601)
@@ -1 +0,0 @@
-extern unsigned _stklen = 24*1024;
Deleted: trunk/Src/ssauto.h
===================================================================
--- trunk/Src/ssauto.h 2013-03-06 22:57:49 UTC (rev 7600)
+++ trunk/Src/ssauto.h 2013-03-06 23:23:15 UTC (rev 7601)
@@ -1,600 +0,0 @@
-/* This header file machine-generated by mktyplib.exe */
-/* Interface to type library: SourceSafeTypeLib */
-
-#ifndef _SourceSafeTypeLib_H_
-#define _SourceSafeTypeLib_H_
-
-DEFINE_GUID(LIBID_SourceSafeTypeLib,0x783CD4E0L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-#ifndef BEGIN_INTERFACE
-#define BEGIN_INTERFACE
-#endif
-
-typedef enum _VSSFlags {
- VSSFLAG_USERRONO = 1,
- VSSFLAG_USERROYES = 2,
- VSSFLAG_TIMENOW = 4,
- VSSFLAG_TIMEMOD = 8,
- VSSFLAG_TIMEUPD = 12,
- VSSFLAG_EOLCR = 16,
- VSSFLAG_EOLLF = 32,
- VSSFLAG_EOLCRLF = 48,
- VSSFLAG_REPASK = 64,
- VSSFLAG_REPREPLACE = 128,
- VSSFLAG_REPSKIP = 192,
- VSSFLAG_REPMERGE = 256,
- VSSFLAG_CMPFULL = 512,
- VSSFLAG_CMPTIME = 1024,
- VSSFLAG_CMPCHKSUM = 1536,
- VSSFLAG_CMPFAIL = 2048,
- VSSFLAG_RECURSNO = 4096,
- VSSFLAG_RECURSYES = 8192,
- VSSFLAG_FORCEDIRNO = 16384,
- VSSFLAG_FORCEDIRYES = 32768,
- VSSFLAG_KEEPNO = 65536,
- VSSFLAG_KEEPYES = 131072,
- VSSFLAG_DELNO = 262144,
- VSSFLAG_DELYES = 524288,
- VSSFLAG_DELNOREPLACE = 786432,
- VSSFLAG_BINTEST = 1048576,
- VSSFLAG_BINBINARY = 2097152,
- VSSFLAG_BINTEXT = 3145728,
- VSSFLAG_DELTAYES = 4194304,
- VSSFLAG_DELTANO = 8388608,
- VSSFLAG_UPDASK = 16777216,
- VSSFLAG_UPDUPDATE = 33554432,
- VSSFLAG_UPDUNCH = 50331648,
- VSSFLAG_GETYES = 67108864,
- VSSFLAG_GETNO = 134217728,
- VSSFLAG_CHKEXCLUSIVEYES = 268435456,
- VSSFLAG_CHKEXCLUSIVENO = 536870912,
- VSSFLAG_HISTIGNOREFILES = 1073741824
-} VSSFlags;
-
-typedef enum _VSSFileStatus {
- VSSFILE_NOTCHECKEDOUT = 0,
- VSSFILE_CHECKEDOUT = 1,
- VSSFILE_CHECKEDOUT_ME = 2
-} VSSFileStatus;
-
-typedef enum _VSSItemType {
- VSSITEM_PROJECT = 0,
- VSSITEM_FILE = 1
-} VSSItemType;
-
-interface IVSSItems;
-
-interface IVSSVersions;
-
-interface IVSSVersion;
-
-interface IVSSCheckouts;
-
-interface IVSSCheckout;
-
-DEFINE_GUID(IID_IVSSItem,0x783CD4E1L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSSItem */
-#undef INTERFACE
-#define INTERFACE IVSSItem
-
-DECLARE_INTERFACE_(IVSSItem, IDispatch)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-
- /* IDispatch methods */
- STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE;
-
- STDMETHOD(GetTypeInfo)(
- THIS_
- UINT itinfo,
- LCID lcid,
- ITypeInfo FAR* FAR* pptinfo) PURE;
-
- STDMETHOD(GetIDsOfNames)(
- THIS_
- REFIID riid,
- OLECHAR FAR* FAR* rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID FAR* rgdispid) PURE;
-
- STDMETHOD(Invoke)(
- THIS_
- DISPID dispidMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS FAR* pdispparams,
- VARIANT FAR* pvarResult,
- EXCEPINFO FAR* pexcepinfo,
- UINT FAR* puArgErr) PURE;
-#endif
-
- /* IVSSItem methods */
- STDMETHOD(get_Spec)(THIS_ BSTR FAR* pSpec) PURE;
- STDMETHOD(get_Binary)(THIS_ VARIANT_BOOL FAR* pbBinary) PURE;
- STDMETHOD(put_Binary)(THIS_ VARIANT_BOOL bBinary) PURE;
- STDMETHOD(get_Deleted)(THIS_ VARIANT_BOOL FAR* pbDeleted) PURE;
- STDMETHOD(put_Deleted)(THIS_ VARIANT_BOOL bDeleted) PURE;
- STDMETHOD(get_Type)(THIS_ int FAR* piType) PURE;
- STDMETHOD(get_LocalSpec)(THIS_ BSTR FAR* pLocal) PURE;
- STDMETHOD(put_LocalSpec)(THIS_ BSTR Local) PURE;
- STDMETHOD(get_Name)(THIS_ BSTR FAR* pName) PURE;
- STDMETHOD(put_Name)(THIS_ BSTR Name) PURE;
- STDMETHOD(get_Parent)(THIS_ IVSSItem FAR* FAR* ppIParent) PURE;
- STDMETHOD(get_VersionNumber)(THIS_ long FAR* piVersion) PURE;
- STDMETHOD(get_Items)(THIS_ VARIANT_BOOL IncludeDeleted, IVSSItems FAR* FAR* ppIItems) PURE;
- STDMETHOD(Get)(THIS_ BSTR FAR* Local, long iFlags) PURE;
- STDMETHOD(Checkout)(THIS_ BSTR Comment, BSTR Local, long iFlags) PURE;
- STDMETHOD(Checkin)(THIS_ BSTR Comment, BSTR Local, long iFlags) PURE;
- STDMETHOD(UndoCheckout)(THIS_ BSTR Local, long iFlags) PURE;
- STDMETHOD(get_IsCheckedOut)(THIS_ long FAR* piStatus) PURE;
- STDMETHOD(get_Checkouts)(THIS_ IVSSCheckouts FAR* FAR* ppICheckouts) PURE;
- STDMETHOD(get_IsDifferent)(THIS_ BSTR Local, VARIANT_BOOL FAR* pbDifferent) PURE;
- STDMETHOD(Add)(THIS_ BSTR Local, BSTR Comment, long iFlags, IVSSItem FAR* FAR* ppIItem) PURE;
- STDMETHOD(NewSubproject)(THIS_ BSTR Name, BSTR Comment, IVSSItem FAR* FAR* ppIItem) PURE;
- STDMETHOD(Share)(THIS_ IVSSItem FAR* pIItem, BSTR Comment, long iFlags) PURE;
- STDMETHOD(Destroy)(THIS) PURE;
- STDMETHOD(Move)(THIS_ IVSSItem FAR* pINewParent) PURE;
- STDMETHOD(Label)(THIS_ BSTR Label, BSTR Comment) PURE;
- STDMETHOD(get_Versions)(THIS_ long iFlags, IVSSVersions FAR* FAR* pIVersions) PURE;
- STDMETHOD(get_Version)(THIS_ VARIANT Version, IVSSItem FAR* FAR* ppIItem) PURE;
-};
-
-DEFINE_GUID(IID_IVSSVersions,0x783CD4E7L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSSVersions */
-#undef INTERFACE
-#define INTERFACE IVSSVersions
-
-DECLARE_INTERFACE_(IVSSVersions, IDispatch)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-
- /* IDispatch methods */
- STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE;
-
- STDMETHOD(GetTypeInfo)(
- THIS_
- UINT itinfo,
- LCID lcid,
- ITypeInfo FAR* FAR* pptinfo) PURE;
-
- STDMETHOD(GetIDsOfNames)(
- THIS_
- REFIID riid,
- OLECHAR FAR* FAR* rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID FAR* rgdispid) PURE;
-
- STDMETHOD(Invoke)(
- THIS_
- DISPID dispidMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS FAR* pdispparams,
- VARIANT FAR* pvarResult,
- EXCEPINFO FAR* pexcepinfo,
- UINT FAR* puArgErr) PURE;
-#endif
-
- /* IVSSVersions methods */
- STDMETHOD(_NewEnum)(THIS_ IUnknown * FAR* ppIEnum) PURE;
-};
-
-DEFINE_GUID(IID_IVSSVersion,0x783CD4E8L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSSVersion */
-#undef INTERFACE
-#define INTERFACE IVSSVersion
-
-DECLARE_INTERFACE_(IVSSVersion, IDispatch)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-
- /* IDispatch methods */
- STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE;
-
- STDMETHOD(GetTypeInfo)(
- THIS_
- UINT itinfo,
- LCID lcid,
- ITypeInfo FAR* FAR* pptinfo) PURE;
-
- STDMETHOD(GetIDsOfNames)(
- THIS_
- REFIID riid,
- OLECHAR FAR* FAR* rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID FAR* rgdispid) PURE;
-
- STDMETHOD(Invoke)(
- THIS_
- DISPID dispidMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS FAR* pdispparams,
- VARIANT FAR* pvarResult,
- EXCEPINFO FAR* pexcepinfo,
- UINT FAR* puArgErr) PURE;
-#endif
-
- /* IVSSVersion methods */
- STDMETHOD(get_Username)(THIS_ BSTR FAR* pUsername) PURE;
- STDMETHOD(get_VersionNumber)(THIS_ long FAR* piVersion) PURE;
- STDMETHOD(get_Action)(THIS_ BSTR FAR* pAction) PURE;
- STDMETHOD(get_Date)(THIS_ DATE FAR* pDate) PURE;
- STDMETHOD(get_Comment)(THIS_ BSTR FAR* pComment) PURE;
- STDMETHOD(get_Label)(THIS_ BSTR FAR* pLabel) PURE;
- STDMETHOD(get_VSSItem)(THIS_ IVSSItem FAR* FAR* ppIItem) PURE;
-};
-
-DEFINE_GUID(IID_IVSSItems,0x783CD4E5L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSSItems */
-#undef INTERFACE
-#define INTERFACE IVSSItems
-
-DECLARE_INTERFACE_(IVSSItems, IDispatch)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-
- /* IDispatch methods */
- STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE;
-
- STDMETHOD(GetTypeInfo)(
- THIS_
- UINT itinfo,
- LCID lcid,
- ITypeInfo FAR* FAR* pptinfo) PURE;
-
- STDMETHOD(GetIDsOfNames)(
- THIS_
- REFIID riid,
- OLECHAR FAR* FAR* rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID FAR* rgdispid) PURE;
-
- STDMETHOD(Invoke)(
- THIS_
- DISPID dispidMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS FAR* pdispparams,
- VARIANT FAR* pvarResult,
- EXCEPINFO FAR* pexcepinfo,
- UINT FAR* puArgErr) PURE;
-#endif
-
- /* IVSSItems methods */
- STDMETHOD(get_Count)(THIS_ long FAR* piCount) PURE;
- STDMETHOD(get_Item)(THIS_ VARIANT sItem, IVSSItem FAR* FAR* ppIItem) PURE;
- STDMETHOD(_NewEnum)(THIS_ IUnknown * FAR* ppIEnum) PURE;
-};
-
-DEFINE_GUID(IID_IVSSCheckouts,0x8903A770L,0xF55F,0x11CF,0x92,0x27,0x00,0xAA,0x00,0xA1,0xEB,0x95);
-
-/* Definition of interface: IVSSCheckouts */
-#undef INTERFACE
-#define INTERFACE IVSSCheckouts
-
-DECLARE_INTERFACE_(IVSSCheckouts, IDispatch)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-
- /* IDispatch methods */
- STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE;
-
- STDMETHOD(GetTypeInfo)(
- THIS_
- UINT itinfo,
- LCID lcid,
- ITypeInfo FAR* FAR* pptinfo) PURE;
-
- STDMETHOD(GetIDsOfNames)(
- THIS_
- REFIID riid,
- OLECHAR FAR* FAR* rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID FAR* rgdispid) PURE;
-
- STDMETHOD(Invoke)(
- THIS_
- DISPID dispidMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS FAR* pdispparams,
- VARIANT FAR* pvarResult,
- EXCEPINFO FAR* pexcepinfo,
- UINT FAR* puArgErr) PURE;
-#endif
-
- /* IVSSCheckouts methods */
- STDMETHOD(get_Count)(THIS_ long FAR* piCount) PURE;
- STDMETHOD(get_Item)(THIS_ VARIANT sItem, IVSSCheckout FAR* FAR* ppICheckout) PURE;
- STDMETHOD(_NewEnum)(THIS_ IUnknown * FAR* ppIEnum) PURE;
-};
-
-DEFINE_GUID(IID_IVSSCheckout,0x783CD4E6L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSSCheckout */
-#undef INTERFACE
-#define INTERFACE IVSSCheckout
-
-DECLARE_INTERFACE_(IVSSCheckout, IDispatch)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-
- /* IDispatch methods */
- STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE;
-
- STDMETHOD(GetTypeInfo)(
- THIS_
- UINT itinfo,
- LCID lcid,
- ITypeInfo FAR* FAR* pptinfo) PURE;
-
- STDMETHOD(GetIDsOfNames)(
- THIS_
- REFIID riid,
- OLECHAR FAR* FAR* rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID FAR* rgdispid) PURE;
-
- STDMETHOD(Invoke)(
- THIS_
- DISPID dispidMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS FAR* pdispparams,
- VARIANT FAR* pvarResult,
- EXCEPINFO FAR* pexcepinfo,
- UINT FAR* puArgErr) PURE;
-#endif
-
- /* IVSSCheckout methods */
- STDMETHOD(get_Username)(THIS_ BSTR FAR* pUsername) PURE;
- STDMETHOD(get_Date)(THIS_ DATE FAR* pDate) PURE;
- STDMETHOD(get_LocalSpec)(THIS_ BSTR FAR* pLocal) PURE;
- STDMETHOD(get_Machine)(THIS_ BSTR FAR* pMachine) PURE;
- STDMETHOD(get_Project)(THIS_ BSTR FAR* pProject) PURE;
- STDMETHOD(get_Comment)(THIS_ BSTR FAR* pComment) PURE;
- STDMETHOD(get_VersionNumber)(THIS_ long FAR* piVersion) PURE;
-};
-
-DEFINE_GUID(IID_IVSSDatabase,0x783CD4E2L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSSDatabase */
-#undef INTERFACE
-#define INTERFACE IVSSDatabase
-
-DECLARE_INTERFACE_(IVSSDatabase, IDispatch)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-
- /* IDispatch methods */
- STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE;
-
- STDMETHOD(GetTypeInfo)(
- THIS_
- UINT itinfo,
- LCID lcid,
- ITypeInfo FAR* FAR* pptinfo) PURE;
-
- STDMETHOD(GetIDsOfNames)(
- THIS_
- REFIID riid,
- OLECHAR FAR* FAR* rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID FAR* rgdispid) PURE;
-
- STDMETHOD(Invoke)(
- THIS_
- DISPID dispidMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS FAR* pdispparams,
- VARIANT FAR* pvarResult,
- EXCEPINFO FAR* pexcepinfo,
- UINT FAR* puArgErr) PURE;
-#endif
-
- /* IVSSDatabase methods */
- STDMETHOD(Open)(THIS_ BSTR SrcSafeIni, BSTR Username, BSTR Password) PURE;
- STDMETHOD(get_SrcSafeIni)(THIS_ BSTR FAR* pSrcSafeIni) PURE;
- STDMETHOD(get_DatabaseName)(THIS_ BSTR FAR* pDatabaseName) PURE;
- STDMETHOD(get_UserName)(THIS_ BSTR FAR* pUsername) PURE;
- STDMETHOD(get_CurrentProject)(THIS_ BSTR FAR* pPrj) PURE;
- STDMETHOD(put_CurrentProject)(THIS_ BSTR Prj) PURE;
- STDMETHOD(get_VSSItem)(THIS_ BSTR Spec, VARIANT_BOOL Deleted, IVSSItem FAR* FAR* ppIVSSItem) PURE;
-};
-
-DEFINE_GUID(CLSID_VSSItem,0x783CD4E3L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-#ifdef __cplusplus
-class VSSItem;
-#endif
-
-DEFINE_GUID(CLSID_VSSVersion,0x783CD4ECL,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-#ifdef __cplusplus
-class VSSVersion;
-#endif
-
-DEFINE_GUID(CLSID_VSSCheckout,0x2A0DE0E0L,0x2E9F,0x11D0,0x92,0x36,0x00,0xAA,0x00,0xA1,0xEB,0x95);
-
-#ifdef __cplusplus
-class VSSCheckout;
-#endif
-
-DEFINE_GUID(CLSID_VSSDatabase,0x783CD4E4L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-#ifdef __cplusplus
-class VSSDatabase;
-#endif
-
-DEFINE_GUID(IID_IVSSEvents,0x783CD4E9L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSSEvents */
-#undef INTERFACE
-#define INTERFACE IVSSEvents
-
-DECLARE_INTERFACE_(IVSSEvents, IUnknown)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-#endif
-
- /* IVSSEvents methods */
- STDMETHOD(BeforeAdd)(THIS_ IVSSItem FAR* pIPrj, BSTR Local, VARIANT_BOOL FAR* pbContinue) PURE;
- STDMETHOD(AfterAdd)(THIS_ IVSSItem FAR* pIItem, BSTR Local) PURE;
- STDMETHOD(BeforeCheckout)(THIS_ IVSSItem FAR* pIItem, BSTR Local, VARIANT_BOOL FAR* pbContinue) PURE;
- STDMETHOD(AfterCheckout)(THIS_ IVSSItem FAR* pIItem, BSTR Local) PURE;
- STDMETHOD(BeforeCheckin)(THIS_ IVSSItem FAR* pIItem, BSTR Local, VARIANT_BOOL FAR* pbContinue) PURE;
- STDMETHOD(AfterCheckin)(THIS_ IVSSItem FAR* pIItem, BSTR Local) PURE;
- STDMETHOD(BeforeUndoCheckout)(THIS_ IVSSItem FAR* pIItem, BSTR Local, VARIANT_BOOL FAR* pbContinue) PURE;
- STDMETHOD(AfterUndoCheckout)(THIS_ IVSSItem FAR* pIItem, BSTR Local) PURE;
- STDMETHOD(BeforeRename)(THIS_ IVSSItem FAR* pIItem, BSTR NewName, VARIANT_BOOL FAR* pbContinue) PURE;
- STDMETHOD(AfterRename)(THIS_ IVSSItem FAR* pIItem, BSTR OldName) PURE;
- STDMETHOD(BeforeBranch)(THIS_ IVSSItem FAR* pIItem, VARIANT_BOOL FAR* pbContinue) PURE;
- STDMETHOD(AfterBranch)(THIS_ IVSSItem FAR* pIItem) PURE;
- STDMETHOD(BeforeEvent)(THIS_ long iEvent, IVSSItem FAR* pIItem, BSTR Str, VARIANT var, VARIANT_BOOL FAR* pbContinue) PURE;
- STDMETHOD(AfterEvent)(THIS_ long iEvent, IVSSItem FAR* pIItem, BSTR Str, VARIANT var) PURE;
-};
-
-DEFINE_GUID(IID_IVSS,0x783CD4EBL,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSS */
-#undef INTERFACE
-#define INTERFACE IVSS
-
-DECLARE_INTERFACE_(IVSS, IDispatch)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-
- /* IDispatch methods */
- STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE;
-
- STDMETHOD(GetTypeInfo)(
- THIS_
- UINT itinfo,
- LCID lcid,
- ITypeInfo FAR* FAR* pptinfo) PURE;
-
- STDMETHOD(GetIDsOfNames)(
- THIS_
- REFIID riid,
- OLECHAR FAR* FAR* rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID FAR* rgdispid) PURE;
-
- STDMETHOD(Invoke)(
- THIS_
- DISPID dispidMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS FAR* pdispparams,
- VARIANT FAR* pvarResult,
- EXCEPINFO FAR* pexcepinfo,
- UINT FAR* puArgErr) PURE;
-#endif
-
- /* IVSS methods */
- STDMETHOD(get_VSSDatabase)(THIS_ IVSSDatabase FAR* FAR* ppIVSSDatabase) PURE;
-};
-
-DEFINE_GUID(IID_IVSSEventHandler,0x783CD4EAL,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
-
-/* Definition of interface: IVSSEventHandler */
-#undef INTERFACE
-#define INTERFACE IVSSEventHandler
-
-DECLARE_INTERFACE_(IVSSEventHandler, IUnknown)
-{
-BEGIN_INTERFACE
-#ifndef NO_BASEINTERFACE_FUNCS
-
- /* IUnknown methods */
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG, AddRef)(THIS) PURE;
- STDMETHOD_(ULONG, Release)(THIS) PURE;
-#endif
-
- /* IVSSEventHandler methods */
- STDMETHOD(Init)(THIS_ IVSS FAR* pIVSS) PURE;
-};
-
-DEFINE_GUID(CLSID_VSSApp,0x2A0DE0E1L,0x2E9F,0x11D0,0x92,0x36,0x00,0xAA,0x00,0xA1,0xEB,0x95);
-
-#ifdef __cplusplus
-class VSSApp;
-#endif
-
-#endif
Deleted: trunk/Src/winnt_supp.h
===================================================================
--- trunk/Src/winnt_supp.h 2013-03-06 22:57:49 UTC (rev 7600)
+++ trunk/Src/winnt_supp.h 2013-03-06 23:23:15 UTC (rev 7601)
@@ -1,48 +0,0 @@
-/**
- * @file winnt_supp.h
- *
- * @brief stuff from PlatformSDK version of WinNT.h which MSVC6 version lacks
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-
-#ifndef winnt_supp_h_included
-#define winnt_supp_h_included
-
-
-#ifndef VER_NT_WORKSTATION
-#define VER_NT_WORKSTATION 0x0000001
-#endif
-
-#ifndef VER_NT_DOMAIN_CONTROLLER
-#define VER_NT_DOMAIN_CONTROLLER 0x0000002
-#endif
-
-#ifndef VER_NT_SERVER
-#define VER_NT_SERVER 0x0000003
-#endif
-
-#ifndef VER_SUITE_ENTERPRISE
-#define VER_SUITE_ENTERPRISE 0x00000002
-#endif
-
-#ifndef VER_SUITE_DATACENTER
-#define VER_SUITE_DATACENTER 0x00000080
-#endif
-
-#ifndef VER_SUITE_SINGLEUSERTS
-#define VER_SUITE_SINGLEUSERTS 0x00000100
-#endif
-
-#ifndef VER_SUITE_PERSONAL
-#define VER_SUITE_PERSONAL 0x00000200
-#endif
-
-#ifndef VER_SUITE_BLADE
-#define VER_SUITE_BLADE 0x00000400
-#endif
-
-
-
-#endif winnt_supp_h_included
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2013-03-06 22:57:51
|
Revision: 7600
http://sourceforge.net/p/winmerge/code/7600
Author: gerundt
Date: 2013-03-06 22:57:49 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
Detect Windows 8 and Windows Server 2012 in config log
Submitted by Takashi Sawanaka
Modified Paths:
--------------
trunk/Src/ConfigLog.cpp
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2013-02-06 05:07:59 UTC (rev 7599)
+++ trunk/Src/ConfigLog.cpp 2013-03-06 22:57:49 UTC (rev 7600)
@@ -717,6 +717,13 @@
else
sVersion = _T("Microsoft Windows Server 2008 R2 ");
}
+ else if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2 )
+ {
+ if (osvi.wProductType == VER_NT_WORKSTATION)
+ sVersion = _T("Microsoft Windows 8 ");
+ else
+ sVersion = _T("Microsoft Windows Server 2012 ");
+ }
else
sVersion = string_format(_T("[? WindowsNT %d.%d] "),
osvi.dwMajorVersion, osvi.dwMinorVersion);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2012-11-05 16:25:41
|
Revision: 7572
http://winmerge.svn.sourceforge.net/winmerge/?rev=7572&view=rev
Author: sdottaka
Date: 2012-11-05 16:25:34 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
PATCH: [ 3387142 ] Basque translation
Submitted by Xabier Aramendi
Modified Paths:
--------------
branches/R2_14/Src/Languages/Basque.po
Modified: branches/R2_14/Src/Languages/Basque.po
===================================================================
--- branches/R2_14/Src/Languages/Basque.po 2012-11-05 16:24:21 UTC (rev 7571)
+++ branches/R2_14/Src/Languages/Basque.po 2012-11-05 16:25:34 UTC (rev 7572)
@@ -11,19 +11,20 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: \n"
+"POT-Creation-Date: 2009-02-10 22:14+0000\n"
"PO-Revision-Date: \n"
-"Last-Translator: Xabier Aramendi <azp...@gm...>\n"
+"Last-Translator: Xabier Aramendi (Azpidatziak) <azp...@gm...>\n"
"Language-Team: (EUS_Xabier Aramendi) <azp...@gm...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Basque (Euskara)\n"
"X-Poedit-SourceCharset: CP1252\n"
-"Plural-Forms: -k, -ak, -ek,\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Country: Basque Country (Navarre)\n"
"X-Poedit-Basepath: ../\n"
"X-Poedit-Bookmarks: 0,439,-1,-1,-1,-1,-1,-1,-1,-1\n"
+"X-Generator: Poedit 1.5.3\n"
#. LANGUAGE, SUBLANGUAGE
#: Merge.rc:22
@@ -54,7 +55,7 @@
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "&Hautatu Lerro Ezberdintasuna"
+msgstr "Hautatu &Lerro Ezberdintasuna"
#: Merge.rc:77
#, c-format
@@ -143,7 +144,7 @@
#: Merge.rc:319
#, c-format
msgid "Op&en Conflict File..."
-msgstr "Ire&ki Agiri Gatazka..."
+msgstr "Ire&ki Gatazka Agiria..."
#: Merge.rc:116
#: Merge.rc:200
@@ -211,7 +212,7 @@
#: Merge.rc:416
#, c-format
msgid "&Toolbar"
-msgstr "&Tresnabarra"
+msgstr "Tre&snabarra"
#: Merge.rc:134
#: Merge.rc:236
@@ -225,7 +226,7 @@
#: Merge.rc:419
#, c-format
msgid "&Small"
-msgstr "Txiki&a"
+msgstr "&Txikia"
#: Merge.rc:136
#: Merge.rc:238
@@ -253,7 +254,7 @@
#: Merge.rc:427
#, c-format
msgid "&Language..."
-msgstr "&Hizkuntza"
+msgstr "Hizkuntz&a"
#: Merge.rc:143
#: Merge.rc:265
@@ -274,14 +275,14 @@
#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
-msgstr "&Sortu Helburua..."
+msgstr "Sortu &Eranskina..."
#: Merge.rc:148
#: Merge.rc:272
#: Merge.rc:455
#, c-format
msgid "&Plugins"
-msgstr "P&luginak"
+msgstr "&Pluginak"
#: Merge.rc:150
#: Merge.rc:274
@@ -326,7 +327,7 @@
#: Merge.rc:469
#, c-format
msgid "&Reload plugins"
-msgstr "Bi&rgertatu pluginak"
+msgstr "B&irgertatu pluginak"
#: Merge.rc:162
#: Merge.rc:283
@@ -404,14 +405,14 @@
#: Merge.rc:1933
#, c-format
msgid "&Help"
-msgstr "&Laguntza"
+msgstr "La&guntza"
#: Merge.rc:180
#: Merge.rc:301
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "&WinMerge Laguntza\tF1"
+msgstr "WinMerge &Laguntza\tF1"
#: Merge.rc:182
#: Merge.rc:303
@@ -548,7 +549,7 @@
#: Merge.rc:431
#, c-format
msgid "&Merge"
-msgstr "Ba&tu"
+msgstr "&Batu"
#: Merge.rc:251
#, c-format
@@ -577,7 +578,7 @@
#: Merge.rc:437
#, c-format
msgid "&Current Difference\tAlt+Enter"
-msgstr "&Uneko Ezberdintasuna\tAlt+Enter"
+msgstr "U&neko Ezberdintasuna\tAlt+Enter"
#: Merge.rc:258
#: Merge.rc:438
@@ -622,7 +623,7 @@
#: Merge.rc:325
#, c-format
msgid "Save &Left"
-msgstr "Gorde &Ezkerra"
+msgstr "Gorde E&zkerra"
#: Merge.rc:327
#: Merge.rc:332
@@ -634,12 +635,12 @@
#: Merge.rc:333
#, c-format
msgid "Save &As..."
-msgstr "Gorde Ho&nela..."
+msgstr "Gorde &Honela..."
#: Merge.rc:330
#, c-format
msgid "Save &Right"
-msgstr "Gorde &Eskuina"
+msgstr "Gorde E&skuina"
#: Merge.rc:336
#, c-format
@@ -649,7 +650,7 @@
#: Merge.rc:337
#, c-format
msgid "Page Se&tup"
-msgstr "Orrialde E&zarpena"
+msgstr "Orrialde Ezarpe&na"
#: Merge.rc:338
#, c-format
@@ -659,7 +660,7 @@
#: Merge.rc:343
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&Bihurtu Lerro Amaierak hona"
+msgstr "Bihurtu &Lerro Amaierak hona"
#: Merge.rc:345
#, c-format
@@ -679,7 +680,7 @@
#: Merge.rc:350
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "&Batu Modua\tF9"
+msgstr "Batu &Modua\tF9"
#: Merge.rc:352
#, c-format
@@ -694,7 +695,7 @@
#: Merge.rc:359
#, c-format
msgid "&Redo\tCtrl+Y"
-msgstr "Birr&egin\tCtrl+Y"
+msgstr "Birre&gin\tCtrl+Y"
#: Merge.rc:361
#, c-format
@@ -724,12 +725,12 @@
#: Merge.rc:369
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "O&rdeztu...\tCtrl+H"
+msgstr "&Ordeztu...\tCtrl+H"
#: Merge.rc:371
#, c-format
msgid "&Scripts"
-msgstr "&Eskriptak"
+msgstr "E&skriptak"
#: Merge.rc:373
#: Merge.rc:2693
@@ -740,7 +741,7 @@
#: Merge.rc:376
#, c-format
msgid "Advanced"
-msgstr "Aurreratua"
+msgstr "Aurrera&tua"
#: Merge.rc:378
#, c-format
@@ -750,7 +751,7 @@
#: Merge.rc:381
#, c-format
msgid "&Bookmarks"
-msgstr "&Lastermarkak"
+msgstr "Laster&markak"
#: Merge.rc:383
#, c-format
@@ -765,7 +766,7 @@
#: Merge.rc:385
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr "&Aurreko lastermarka\tShift+F2"
+msgstr "A&urreko Lastermarka\tShift+F2"
#: Merge.rc:386
#, c-format
@@ -801,17 +802,17 @@
#: Merge.rc:402
#, c-format
msgid "Syntax Highlight"
-msgstr "Joskera Nabarmentzea"
+msgstr "Joskera Nabar&mentzea"
#: Merge.rc:407
#, c-format
msgid "&Lock Panes"
-msgstr "&Blokeatu Panelak"
+msgstr "Bl&okeatu Panelak"
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "&Ikusi Zurigunea"
+msgstr "Ikusi Zurigu&nea"
#: Merge.rc:409
#, c-format
@@ -821,7 +822,7 @@
#: Merge.rc:410
#, c-format
msgid "View Line &Numbers"
-msgstr "Ikusi Lerro &Zenbakiak"
+msgstr "Ikusi &Lerro Zenbakiak"
#: Merge.rc:411
#, c-format
@@ -846,7 +847,7 @@
#: Merge.rc:425
#, c-format
msgid "Lo&cation Pane"
-msgstr "&Kokaleku Panela"
+msgstr "Kokalek&u Panela"
#: Merge.rc:443
#, c-format
@@ -856,7 +857,7 @@
#: Merge.rc:444
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopiatu E&zkerrera eta Aurrera egin\tAlt+Ctrl+Right"
+msgstr "Kopiatu Ez&kerrera eta Aurrera egin\tAlt+Ctrl+Right"
#: Merge.rc:446
#, c-format
@@ -938,7 +939,7 @@
#: Merge.rc:1501
#, c-format
msgid "&Left"
-msgstr "Ez&kerra"
+msgstr "Ezker&ra"
#: Merge.rc:527
#: Merge.rc:1138
@@ -1112,7 +1113,7 @@
#: Merge.rc:678
#, c-format
msgid "Contributors"
-msgstr "Laguntzaileak"
+msgstr "&Laguntzaileak"
#: Merge.rc:685
#, c-format
@@ -1131,7 +1132,7 @@
#: Merge.rc:1020
#, c-format
msgid "&Browse..."
-msgstr "&Bilatu..."
+msgstr "Bil&atu..."
#: Merge.rc:693
#: Merge.rc:1582
@@ -1155,7 +1156,7 @@
#: Merge.rc:1588
#, c-format
msgid "Select..."
-msgstr "Hautatu..."
+msgstr "Ha&utatu..."
#: Merge.rc:702
#, c-format
@@ -1286,12 +1287,12 @@
#: Merge.rc:764
#, c-format
msgid "&Disable Splash Screen"
-msgstr "&Ezgaitu Sakabanaketa Leihoa"
+msgstr "&Ezgaitu sakabanaketa leihoa"
#: Merge.rc:766
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "&Itxi leihoak ESC-rekin"
+msgstr "Itxi leihoak ES&C-rekin"
#: Merge.rc:768
#, c-format
@@ -1301,12 +1302,12 @@
#: Merge.rc:771
#, c-format
msgid "All&ow only one instance to run"
-msgstr "Ahalbidetu bakarrik ekinbide bat"
+msgstr "Ahalbidetu e&kinbide bat bakarrik "
#: Merge.rc:773
#, c-format
msgid "As&k when closing multiple windows"
-msgstr "Galdetu l&eiho anitz isterakoan"
+msgstr "Gal&detu leiho anitz isterakoan"
#: Merge.rc:775
#, c-format
@@ -1316,12 +1317,12 @@
#: Merge.rc:778
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr "Erakutsi \"Hautatu agiriak edo Agiritegiak\" Elkarrizk. Hasterakoan"
+msgstr "Erakutsi \"Hau&tatu agiriak edo Agiritegiak\" Elkarrizk. Hasterakoan"
#: Merge.rc:780
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "&Ireki-elkarrizketa Berez-Osaketa:"
+msgstr "Ireki-elkarrizketa Berez-&Osaketa:"
#: Merge.rc:783
#, c-format
@@ -1375,7 +1376,7 @@
#: Merge.rc:847
#, c-format
msgid "Match &whole word only"
-msgstr "Hitz osoa bat datorrenean bakarrik"
+msgstr "Hitz osoa bat datorre&nean bakarrik"
#: Merge.rc:819
#: Merge.rc:849
@@ -1413,7 +1414,7 @@
#: Merge.rc:861
#, c-format
msgid "&Find Next"
-msgstr "&Bilatu Hurrengoa"
+msgstr "Bilatu &Hurrengoa"
#: Merge.rc:838
#, c-format
@@ -1423,7 +1424,7 @@
#: Merge.rc:844
#, c-format
msgid "Re&place with:"
-msgstr "Or&deztu honekin:"
+msgstr "Ordez&tu honekin:"
#: Merge.rc:853
#, c-format
@@ -1438,12 +1439,12 @@
#: Merge.rc:857
#, c-format
msgid "&Selection"
-msgstr "&Hautapena"
+msgstr "Hauta&pena"
#: Merge.rc:859
#, c-format
msgid "Wh&ole file"
-msgstr "Agi&ri osoa"
+msgstr "&Agiri osoa"
#: Merge.rc:862
#, c-format
@@ -1623,18 +1624,18 @@
#: Merge.rc:1005
#, c-format
msgid "C&ustom folder:"
-msgstr "E&gile agiritegia:"
+msgstr "&Egile agiritegia:"
#: Merge.rc:1008
#: Merge.rc:1024
#, c-format
msgid "Br&owse..."
-msgstr "Bi&latu"
+msgstr "Bilat&u"
#: Merge.rc:1014
#, c-format
msgid "Patch Generator"
-msgstr "Helburu Sortzailea"
+msgstr "Eranskin Sortzailea"
#: Merge.rc:1017
#, c-format
@@ -1649,7 +1650,7 @@
#: Merge.rc:1025
#, c-format
msgid "&Swap"
-msgstr "&Aldaketa"
+msgstr "A&ldaketa"
#: Merge.rc:1026
#, c-format
@@ -1689,7 +1690,7 @@
#: Merge.rc:1042
#, c-format
msgid "I&gnore changes"
-msgstr "&Ezikusi aldaketak"
+msgstr "Ezikus&i aldaketak"
#: Merge.rc:1044
#, c-format
@@ -1704,7 +1705,7 @@
#: Merge.rc:1048
#, c-format
msgid "Case sensi&tive"
-msgstr "Hizki larri eta xehe artean"
+msgstr "Hizki larri eta &xehe artean"
#: Merge.rc:1050
#, c-format
@@ -1831,7 +1832,7 @@
#: Merge.rc:1155
#, c-format
msgid "&Compare"
-msgstr "&Alderatu"
+msgstr "Al&deratu"
#: Merge.rc:1156
#, c-format
@@ -1856,12 +1857,12 @@
#: Merge.rc:1160
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "Ezikusi gurdi itzulera ezberdintasunak (Windows/Unix/Mac)"
+msgstr "Ezikusi g&urdi itzulera ezberdintasunak (Windows/Unix/Mac)"
#: Merge.rc:1162
#, c-format
msgid "E&nable moved block detection"
-msgstr "Gaitu b&loke mugitu atzematea"
+msgstr "Gaitu bloke &mugitu atzematea"
#: Merge.rc:1163
#, c-format
@@ -1871,7 +1872,7 @@
#: Merge.rc:1165
#, c-format
msgid "Filter Comments"
-msgstr "Iragazki Aipamenak"
+msgstr "&Iragazki Aipamenak"
#: Merge.rc:1171
#: Merge.rc:1943
@@ -1902,7 +1903,7 @@
#: Merge.rc:1181
#, c-format
msgid "&Tab size:"
-msgstr "&Fitxa neurria:"
+msgstr "Fit&xa neurria:"
#: Merge.rc:1184
#, c-format
@@ -1922,7 +1923,7 @@
#: Merge.rc:1190
#, c-format
msgid "View line differences"
-msgstr "Ikusi lerro ezberdintasunak"
+msgstr "&Ikusi lerro ezberdintasunak"
#: Merge.rc:1192
#, c-format
@@ -1932,7 +1933,7 @@
#: Merge.rc:1194
#, c-format
msgid "&Word-level:"
-msgstr "&Hitz maila:"
+msgstr "Hit&z maila:"
#: Merge.rc:1209
#, c-format
@@ -2027,23 +2028,23 @@
"Detect codepage info for these files: .html, .rc, .xml \n"
"need to restart session"
msgstr ""
-"Atzeman kode-orrialde argibideak agiri hauentzat:\n"
+"&Atzeman kode-orrialde argibideak agiri hauentzat:\n"
" .html, .rc, .xml. Saioa birrabiaraztea beharrezkoa da."
#: Merge.rc:1258
#, c-format
msgid "System codepage"
-msgstr "Sistema kode-orrialdea"
+msgstr "&Sistema kode-orrialdea"
#: Merge.rc:1260
#, c-format
msgid "According to WinMerge User Interface"
-msgstr "WinMerge Erabiltzaile Interfazearen arabera"
+msgstr "&WinMerge Erabiltzaile Interfazearen arabera"
#: Merge.rc:1262
#, c-format
msgid "Custom codepage:"
-msgstr "Egile kode-orrialdea:"
+msgstr "&Egile kode-orrialdea:"
#: Merge.rc:1270
#, c-format
@@ -2062,7 +2063,7 @@
"essential components to be copied to the program directory for standalone operation."
msgstr ""
"Agiri sostenguak 7-Zip 3.11 edo berriagoa zure ordenagailuan ezarrita egotea\n"
-"eskatzen du, edo bere beharrezko osoagaiak programaren zuzenbidera kopiatuta izatea eragiketa askerako."
+"eskatzen du, edo bere beharrezko osagaiak programaren zuzenbidera kopiatuta izatea eragiketa askerako."
#: Merge.rc:1278
#, c-format
@@ -2413,7 +2414,7 @@
#: Merge.rc:1514
#, c-format
msgid "&Use same codepage for both"
-msgstr "&Erabili kode-orrialde bera bientzat"
+msgstr "Erabili &kode-orrialde bera bientzat"
#: Merge.rc:1517
#, c-format
@@ -2424,7 +2425,7 @@
#: Merge.rc:1916
#, c-format
msgid "&Cancel"
-msgstr "&Ezeztatu"
+msgstr "E&zeztatu"
#: Merge.rc:1523
#, c-format
@@ -2499,7 +2500,7 @@
#: Merge.rc:1585
#, c-format
msgid "Re&ad-only"
-msgstr "&I&rakurri-bakarrik"
+msgstr "Irakurri-&bakarrik"
#: Merge.rc:1591
#, c-format
@@ -2530,7 +2531,7 @@
#: Merge.rc:1606
#, c-format
msgid "&Original file's folder"
-msgstr "&Agiriaren jatorrizko agiritegia"
+msgstr "Agiriaren &jatorrizko agiritegia"
#: Merge.rc:1608
#, c-format
@@ -2550,7 +2551,7 @@
#: Merge.rc:1615
#, c-format
msgid "A&ppend timestamp"
-msgstr "Erantsi denbora"
+msgstr "Erantsi &denbora"
#: Merge.rc:1622
#: Merge.rc:2246
@@ -2612,12 +2613,12 @@
#: Merge.rc:1661
#, c-format
msgid "In&clude subfolders by default"
-msgstr "Az&piagiritegiak barne berez"
+msgstr "&Azpiagiritegiak barne berez"
#: Merge.rc:1663
#, c-format
msgid "&Add to context menu"
-msgstr "Ge&hitu hitzinguru menura"
+msgstr "Gehitu &hitzinguru menura"
#: Merge.rc:1665
#, c-format
@@ -2644,7 +2645,7 @@
#: Merge.rc:1679
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Ezikusi 3 segundu baino gutxiagoko ezberdintasunak"
+msgstr "Ezikusi 3 segundu baino gut&xiagoko ezberdintasunak"
#: Merge.rc:1681
#, c-format
@@ -4156,7 +4157,7 @@
"\n"
"%1 ?"
msgstr ""
-"Ziihur zaude ezabatzea nahi duzula\n"
+"Zihur zaude ezabatzea nahi duzula\n"
"\n"
"%1?"
@@ -4834,7 +4835,7 @@
#: Merge.rc:2472
#, c-format
msgid "Patch file successfully written."
-msgstr "Helburu agiria ongi idatzi da."
+msgstr "Eranskina agiria ongi idatzi da."
#: Merge.rc:2473
#, c-format
@@ -4849,7 +4850,7 @@
#: Merge.rc:2475
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
-msgstr "Helburu agiria jadanik badago. Gainidaztea nahi duzu?"
+msgstr "Eranskin agiria jadanik badago. Gainidaztea nahi duzu?"
#: Merge.rc:2476
#, c-format
@@ -4889,12 +4890,12 @@
#: Merge.rc:2483
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "Ezin da helburu agiria sortu agiri binarioetatik"
+msgstr "Ezin da eranski agiria sortu agiri binarioetatik."
#: Merge.rc:2484
#, c-format
msgid "Cannot create a patch file from directories."
-msgstr "Ezin da helburu agiria sortu zuzenbideetatik"
+msgstr "Ezin da eranskina agiria sortu zuzenbideetatik"
#: Merge.rc:2485
#, c-format
@@ -4905,7 +4906,7 @@
msgstr ""
"Mesedez gorde agiri guztiak lehenik.\n"
"\n"
-"Helburua sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du."
+"Eranskina sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du."
#: Merge.rc:2486
#, c-format
@@ -4926,7 +4927,7 @@
msgstr ""
"Agiri sostengua ez dago gaituta\n"
"Beharrezko osagai guztiak (7-zip eta/edo Merge7z*.dll) agiri sostengurako ezin dira aurkitu.\n"
-"Ikusi eskuliburua argibide gehaigorako agiri sostenguari buruz eta nola gaitzeaz."
+"Ikusi eskuliburua argibide gehigorako agiri sostenguari buruz eta nola gaitzeaz."
#: Merge.rc:2493
#, c-format
@@ -5561,7 +5562,7 @@
#: Merge.rc:2651
#, c-format
msgid "Generate a patch-file"
-msgstr "Helburu-agiri bat sortu"
+msgstr "Eranskin-agiri bat sortu"
#: Merge.rc:2652
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2012-11-05 16:24:28
|
Revision: 7571
http://winmerge.svn.sourceforge.net/winmerge/?rev=7571&view=rev
Author: sdottaka
Date: 2012-11-05 16:24:21 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
PATCH: [ 3387142 ] Basque translation
Submitted by Xabier Aramendi
Modified Paths:
--------------
trunk/Translations/WinMerge/Basque.po
Modified: trunk/Translations/WinMerge/Basque.po
===================================================================
--- trunk/Translations/WinMerge/Basque.po 2011-12-09 13:42:55 UTC (rev 7570)
+++ trunk/Translations/WinMerge/Basque.po 2012-11-05 16:24:21 UTC (rev 7571)
@@ -11,19 +11,20 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: \n"
+"POT-Creation-Date: 2009-02-10 22:14+0000\n"
"PO-Revision-Date: \n"
-"Last-Translator: Xabier Aramendi <azp...@gm...>\n"
+"Last-Translator: Xabier Aramendi (Azpidatziak) <azp...@gm...>\n"
"Language-Team: (EUS_Xabier Aramendi) <azp...@gm...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Basque (Euskara)\n"
"X-Poedit-SourceCharset: CP1252\n"
-"Plural-Forms: -k, -ak, -ek,\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Country: Basque Country (Navarre)\n"
"X-Poedit-Basepath: ../\n"
"X-Poedit-Bookmarks: 0,439,-1,-1,-1,-1,-1,-1,-1,-1\n"
+"X-Generator: Poedit 1.5.3\n"
#. LANGUAGE, SUBLANGUAGE
#: Merge.rc:22
@@ -54,7 +55,7 @@
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "&Hautatu Lerro Ezberdintasuna"
+msgstr "Hautatu &Lerro Ezberdintasuna"
#: Merge.rc:77
#, c-format
@@ -143,7 +144,7 @@
#: Merge.rc:319
#, c-format
msgid "Op&en Conflict File..."
-msgstr "Ire&ki Agiri Gatazka..."
+msgstr "Ire&ki Gatazka Agiria..."
#: Merge.rc:116
#: Merge.rc:200
@@ -211,7 +212,7 @@
#: Merge.rc:416
#, c-format
msgid "&Toolbar"
-msgstr "&Tresnabarra"
+msgstr "Tre&snabarra"
#: Merge.rc:134
#: Merge.rc:236
@@ -225,7 +226,7 @@
#: Merge.rc:419
#, c-format
msgid "&Small"
-msgstr "Txiki&a"
+msgstr "&Txikia"
#: Merge.rc:136
#: Merge.rc:238
@@ -253,7 +254,7 @@
#: Merge.rc:427
#, c-format
msgid "&Language..."
-msgstr "&Hizkuntza"
+msgstr "Hizkuntz&a"
#: Merge.rc:143
#: Merge.rc:265
@@ -274,14 +275,14 @@
#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
-msgstr "&Sortu Helburua..."
+msgstr "Sortu &Eranskina..."
#: Merge.rc:148
#: Merge.rc:272
#: Merge.rc:455
#, c-format
msgid "&Plugins"
-msgstr "P&luginak"
+msgstr "&Pluginak"
#: Merge.rc:150
#: Merge.rc:274
@@ -326,7 +327,7 @@
#: Merge.rc:469
#, c-format
msgid "&Reload plugins"
-msgstr "Bi&rgertatu pluginak"
+msgstr "B&irgertatu pluginak"
#: Merge.rc:162
#: Merge.rc:283
@@ -404,14 +405,14 @@
#: Merge.rc:1943
#, c-format
msgid "&Help"
-msgstr "&Laguntza"
+msgstr "La&guntza"
#: Merge.rc:180
#: Merge.rc:301
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "&WinMerge Laguntza\tF1"
+msgstr "WinMerge &Laguntza\tF1"
#: Merge.rc:182
#: Merge.rc:303
@@ -548,7 +549,7 @@
#: Merge.rc:431
#, c-format
msgid "&Merge"
-msgstr "Ba&tu"
+msgstr "&Batu"
#: Merge.rc:251
#, c-format
@@ -577,7 +578,7 @@
#: Merge.rc:437
#, c-format
msgid "&Current Difference\tAlt+Enter"
-msgstr "&Uneko Ezberdintasuna\tAlt+Enter"
+msgstr "U&neko Ezberdintasuna\tAlt+Enter"
#: Merge.rc:258
#: Merge.rc:438
@@ -622,7 +623,7 @@
#: Merge.rc:325
#, c-format
msgid "Save &Left"
-msgstr "Gorde &Ezkerra"
+msgstr "Gorde E&zkerra"
#: Merge.rc:327
#: Merge.rc:332
@@ -634,12 +635,12 @@
#: Merge.rc:333
#, c-format
msgid "Save &As..."
-msgstr "Gorde Ho&nela..."
+msgstr "Gorde &Honela..."
#: Merge.rc:330
#, c-format
msgid "Save &Right"
-msgstr "Gorde &Eskuina"
+msgstr "Gorde E&skuina"
#: Merge.rc:336
#, c-format
@@ -649,7 +650,7 @@
#: Merge.rc:337
#, c-format
msgid "Page Se&tup"
-msgstr "Orrialde E&zarpena"
+msgstr "Orrialde Ezarpe&na"
#: Merge.rc:338
#, c-format
@@ -659,7 +660,7 @@
#: Merge.rc:343
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&Bihurtu Lerro Amaierak hona"
+msgstr "Bihurtu &Lerro Amaierak hona"
#: Merge.rc:345
#, c-format
@@ -679,7 +680,7 @@
#: Merge.rc:350
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "&Batu Modua\tF9"
+msgstr "Batu &Modua\tF9"
#: Merge.rc:352
#, c-format
@@ -694,7 +695,7 @@
#: Merge.rc:359
#, c-format
msgid "&Redo\tCtrl+Y"
-msgstr "Birr&egin\tCtrl+Y"
+msgstr "Birre&gin\tCtrl+Y"
#: Merge.rc:361
#, c-format
@@ -724,12 +725,12 @@
#: Merge.rc:369
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "O&rdeztu...\tCtrl+H"
+msgstr "&Ordeztu...\tCtrl+H"
#: Merge.rc:371
#, c-format
msgid "&Scripts"
-msgstr "&Eskriptak"
+msgstr "E&skriptak"
#: Merge.rc:373
#: Merge.rc:2703
@@ -740,7 +741,7 @@
#: Merge.rc:376
#, c-format
msgid "Advanced"
-msgstr "Aurreratua"
+msgstr "Aurrera&tua"
#: Merge.rc:378
#, c-format
@@ -750,7 +751,7 @@
#: Merge.rc:381
#, c-format
msgid "&Bookmarks"
-msgstr "&Lastermarkak"
+msgstr "Laster&markak"
#: Merge.rc:383
#, c-format
@@ -765,7 +766,7 @@
#: Merge.rc:385
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr "&Aurreko lastermarka\tShift+F2"
+msgstr "A&urreko Lastermarka\tShift+F2"
#: Merge.rc:386
#, c-format
@@ -801,17 +802,17 @@
#: Merge.rc:402
#, c-format
msgid "Syntax Highlight"
-msgstr "Joskera Nabarmentzea"
+msgstr "Joskera Nabar&mentzea"
#: Merge.rc:407
#, c-format
msgid "&Lock Panes"
-msgstr "&Blokeatu Panelak"
+msgstr "Bl&okeatu Panelak"
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "&Ikusi Zurigunea"
+msgstr "Ikusi Zurigu&nea"
#: Merge.rc:409
#, c-format
@@ -821,7 +822,7 @@
#: Merge.rc:410
#, c-format
msgid "View Line &Numbers"
-msgstr "Ikusi Lerro &Zenbakiak"
+msgstr "Ikusi &Lerro Zenbakiak"
#: Merge.rc:411
#, c-format
@@ -846,7 +847,7 @@
#: Merge.rc:425
#, c-format
msgid "Lo&cation Pane"
-msgstr "&Kokaleku Panela"
+msgstr "Kokalek&u Panela"
#: Merge.rc:443
#, c-format
@@ -856,7 +857,7 @@
#: Merge.rc:444
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopiatu E&zkerrera eta Aurrera egin\tAlt+Ctrl+Right"
+msgstr "Kopiatu Ez&kerrera eta Aurrera egin\tAlt+Ctrl+Right"
#: Merge.rc:446
#, c-format
@@ -938,7 +939,7 @@
#: Merge.rc:1509
#, c-format
msgid "&Left"
-msgstr "Ez&kerra"
+msgstr "Ezker&ra"
#: Merge.rc:527
#: Merge.rc:1144
@@ -1112,7 +1113,7 @@
#: Merge.rc:678
#, c-format
msgid "Contributors"
-msgstr "Laguntzaileak"
+msgstr "&Laguntzaileak"
#: Merge.rc:685
#, c-format
@@ -1131,7 +1132,7 @@
#: Merge.rc:1026
#, c-format
msgid "&Browse..."
-msgstr "&Bilatu..."
+msgstr "Bil&atu..."
#: Merge.rc:693
#: Merge.rc:1590
@@ -1155,7 +1156,7 @@
#: Merge.rc:1596
#, c-format
msgid "Select..."
-msgstr "Hautatu..."
+msgstr "Ha&utatu..."
#: Merge.rc:702
#, c-format
@@ -1286,12 +1287,12 @@
#: Merge.rc:764
#, c-format
msgid "&Disable Splash Screen"
-msgstr "&Ezgaitu Sakabanaketa Leihoa"
+msgstr "&Ezgaitu sakabanaketa leihoa"
#: Merge.rc:766
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "&Itxi leihoak ESC-rekin"
+msgstr "Itxi leihoak ES&C-rekin"
#: Merge.rc:768
#, c-format
@@ -1301,12 +1302,12 @@
#: Merge.rc:771
#, c-format
msgid "All&ow only one instance to run"
-msgstr "Ahalbidetu bakarrik ekinbide bat"
+msgstr "Ahalbidetu e&kinbide bat bakarrik "
#: Merge.rc:773
#, c-format
msgid "As&k when closing multiple windows"
-msgstr "Galdetu l&eiho anitz isterakoan"
+msgstr "Gal&detu leiho anitz isterakoan"
#: Merge.rc:775
#, c-format
@@ -1316,12 +1317,12 @@
#: Merge.rc:778
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr "Erakutsi \"Hautatu agiriak edo Agiritegiak\" Elkarrizk. Hasterakoan"
+msgstr "Erakutsi \"Hau&tatu agiriak edo Agiritegiak\" Elkarrizk. Hasterakoan"
#: Merge.rc:780
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "&Ireki-elkarrizketa Berez-Osaketa:"
+msgstr "Ireki-elkarrizketa Berez-&Osaketa:"
#: Merge.rc:783
#, c-format
@@ -1375,7 +1376,7 @@
#: Merge.rc:847
#, c-format
msgid "Match &whole word only"
-msgstr "Hitz osoa bat datorrenean bakarrik"
+msgstr "Hitz osoa bat datorre&nean bakarrik"
#: Merge.rc:819
#: Merge.rc:849
@@ -1413,7 +1414,7 @@
#: Merge.rc:861
#, c-format
msgid "&Find Next"
-msgstr "&Bilatu Hurrengoa"
+msgstr "Bilatu &Hurrengoa"
#: Merge.rc:838
#, c-format
@@ -1423,7 +1424,7 @@
#: Merge.rc:844
#, c-format
msgid "Re&place with:"
-msgstr "Or&deztu honekin:"
+msgstr "Ordez&tu honekin:"
#: Merge.rc:853
#, c-format
@@ -1438,12 +1439,12 @@
#: Merge.rc:857
#, c-format
msgid "&Selection"
-msgstr "&Hautapena"
+msgstr "Hauta&pena"
#: Merge.rc:859
#, c-format
msgid "Wh&ole file"
-msgstr "Agi&ri osoa"
+msgstr "&Agiri osoa"
#: Merge.rc:862
#, c-format
@@ -1623,18 +1624,18 @@
#: Merge.rc:1011
#, c-format
msgid "C&ustom folder:"
-msgstr "E&gile agiritegia:"
+msgstr "&Egile agiritegia:"
#: Merge.rc:1014
#: Merge.rc:1030
#, c-format
msgid "Br&owse..."
-msgstr "Bi&latu"
+msgstr "Bilat&u"
#: Merge.rc:1020
#, c-format
msgid "Patch Generator"
-msgstr "Helburu Sortzailea"
+msgstr "Eranskin Sortzailea"
#: Merge.rc:1023
#, c-format
@@ -1649,7 +1650,7 @@
#: Merge.rc:1031
#, c-format
msgid "&Swap"
-msgstr "&Aldaketa"
+msgstr "A&ldaketa"
#: Merge.rc:1032
#, c-format
@@ -1689,7 +1690,7 @@
#: Merge.rc:1048
#, c-format
msgid "I&gnore changes"
-msgstr "&Ezikusi aldaketak"
+msgstr "Ezikus&i aldaketak"
#: Merge.rc:1050
#, c-format
@@ -1704,7 +1705,7 @@
#: Merge.rc:1054
#, c-format
msgid "Case sensi&tive"
-msgstr "Hizki larri eta xehe artean"
+msgstr "Hizki larri eta &xehe artean"
#: Merge.rc:1056
#, c-format
@@ -1831,7 +1832,7 @@
#: Merge.rc:1161
#, c-format
msgid "&Compare"
-msgstr "&Alderatu"
+msgstr "Al&deratu"
#: Merge.rc:1162
#, c-format
@@ -1856,12 +1857,12 @@
#: Merge.rc:1166
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "Ezikusi gurdi itzulera ezberdintasunak (Windows/Unix/Mac)"
+msgstr "Ezikusi g&urdi itzulera ezberdintasunak (Windows/Unix/Mac)"
#: Merge.rc:1168
#, c-format
msgid "E&nable moved block detection"
-msgstr "Gaitu b&loke mugitu atzematea"
+msgstr "Gaitu bloke &mugitu atzematea"
#: Merge.rc:1169
#, c-format
@@ -1871,7 +1872,7 @@
#: Merge.rc:1171
#, c-format
msgid "Filter Comments"
-msgstr "Iragazki Aipamenak"
+msgstr "&Iragazki Aipamenak"
#: Merge.rc:1177
#: Merge.rc:1953
@@ -1902,7 +1903,7 @@
#: Merge.rc:1187
#, c-format
msgid "&Tab size:"
-msgstr "&Fitxa neurria:"
+msgstr "Fit&xa neurria:"
#: Merge.rc:1190
#, c-format
@@ -1922,7 +1923,7 @@
#: Merge.rc:1196
#, c-format
msgid "View line differences"
-msgstr "Ikusi lerro ezberdintasunak"
+msgstr "&Ikusi lerro ezberdintasunak"
#: Merge.rc:1198
#, c-format
@@ -1932,7 +1933,7 @@
#: Merge.rc:1200
#, c-format
msgid "&Word-level:"
-msgstr "&Hitz maila:"
+msgstr "Hit&z maila:"
#: Merge.rc:1204
#, c-format
@@ -2032,23 +2033,23 @@
"Detect codepage info for these files: .html, .rc, .xml \n"
"need to restart session"
msgstr ""
-"Atzeman kode-orrialde argibideak agiri hauentzat:\n"
+"&Atzeman kode-orrialde argibideak agiri hauentzat:\n"
" .html, .rc, .xml. Saioa birrabiaraztea beharrezkoa da."
#: Merge.rc:1266
#, c-format
msgid "System codepage"
-msgstr "Sistema kode-orrialdea"
+msgstr "&Sistema kode-orrialdea"
#: Merge.rc:1268
#, c-format
msgid "According to WinMerge User Interface"
-msgstr "WinMerge Erabiltzaile Interfazearen arabera"
+msgstr "&WinMerge Erabiltzaile Interfazearen arabera"
#: Merge.rc:1270
#, c-format
msgid "Custom codepage:"
-msgstr "Egile kode-orrialdea:"
+msgstr "&Egile kode-orrialdea:"
#: Merge.rc:1278
#, c-format
@@ -2067,7 +2068,7 @@
"essential components to be copied to the program directory for standalone operation."
msgstr ""
"Agiri sostenguak 7-Zip 3.11 edo berriagoa zure ordenagailuan ezarrita egotea\n"
-"eskatzen du, edo bere beharrezko osoagaiak programaren zuzenbidera kopiatuta izatea eragiketa askerako."
+"eskatzen du, edo bere beharrezko osagaiak programaren zuzenbidera kopiatuta izatea eragiketa askerako."
#: Merge.rc:1286
#, c-format
@@ -2418,7 +2419,7 @@
#: Merge.rc:1522
#, c-format
msgid "&Use same codepage for both"
-msgstr "&Erabili kode-orrialde bera bientzat"
+msgstr "Erabili &kode-orrialde bera bientzat"
#: Merge.rc:1525
#, c-format
@@ -2429,7 +2430,7 @@
#: Merge.rc:1926
#, c-format
msgid "&Cancel"
-msgstr "&Ezeztatu"
+msgstr "E&zeztatu"
#: Merge.rc:1531
#, c-format
@@ -2504,7 +2505,7 @@
#: Merge.rc:1593
#, c-format
msgid "Re&ad-only"
-msgstr "&I&rakurri-bakarrik"
+msgstr "Irakurri-&bakarrik"
#: Merge.rc:1599
#, c-format
@@ -2535,7 +2536,7 @@
#: Merge.rc:1614
#, c-format
msgid "&Original file's folder"
-msgstr "&Agiriaren jatorrizko agiritegia"
+msgstr "Agiriaren &jatorrizko agiritegia"
#: Merge.rc:1616
#, c-format
@@ -2555,7 +2556,7 @@
#: Merge.rc:1623
#, c-format
msgid "A&ppend timestamp"
-msgstr "Erantsi denbora"
+msgstr "Erantsi &denbora"
#: Merge.rc:1630
#: Merge.rc:2256
@@ -2617,12 +2618,12 @@
#: Merge.rc:1669
#, c-format
msgid "In&clude subfolders by default"
-msgstr "Az&piagiritegiak barne berez"
+msgstr "&Azpiagiritegiak barne berez"
#: Merge.rc:1671
#, c-format
msgid "&Add to context menu"
-msgstr "Ge&hitu hitzinguru menura"
+msgstr "Gehitu &hitzinguru menura"
#: Merge.rc:1673
#, c-format
@@ -2654,7 +2655,7 @@
#: Merge.rc:1688
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Ezikusi 3 segundu baino gutxiagoko ezberdintasunak"
+msgstr "Ezikusi 3 segundu baino gut&xiagoko ezberdintasunak"
#: Merge.rc:1690
#, c-format
@@ -4166,7 +4167,7 @@
"\n"
"%1 ?"
msgstr ""
-"Ziihur zaude ezabatzea nahi duzula\n"
+"Zihur zaude ezabatzea nahi duzula\n"
"\n"
"%1?"
@@ -4844,7 +4845,7 @@
#: Merge.rc:2482
#, c-format
msgid "Patch file successfully written."
-msgstr "Helburu agiria ongi idatzi da."
+msgstr "Eranskina agiria ongi idatzi da."
#: Merge.rc:2483
#, c-format
@@ -4859,7 +4860,7 @@
#: Merge.rc:2485
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
-msgstr "Helburu agiria jadanik badago. Gainidaztea nahi duzu?"
+msgstr "Eranskin agiria jadanik badago. Gainidaztea nahi duzu?"
#: Merge.rc:2486
#, c-format
@@ -4899,12 +4900,12 @@
#: Merge.rc:2493
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "Ezin da helburu agiria sortu agiri binarioetatik"
+msgstr "Ezin da eranski agiria sortu agiri binarioetatik."
#: Merge.rc:2494
#, c-format
msgid "Cannot create a patch file from directories."
-msgstr "Ezin da helburu agiria sortu zuzenbideetatik"
+msgstr "Ezin da eranskina agiria sortu zuzenbideetatik"
#: Merge.rc:2495
#, c-format
@@ -4915,7 +4916,7 @@
msgstr ""
"Mesedez gorde agiri guztiak lehenik.\n"
"\n"
-"Helburua sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du."
+"Eranskina sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du."
#: Merge.rc:2496
#, c-format
@@ -4936,7 +4937,7 @@
msgstr ""
"Agiri sostengua ez dago gaituta\n"
"Beharrezko osagai guztiak (7-zip eta/edo Merge7z*.dll) agiri sostengurako ezin dira aurkitu.\n"
-"Ikusi eskuliburua argibide gehaigorako agiri sostenguari buruz eta nola gaitzeaz."
+"Ikusi eskuliburua argibide gehigorako agiri sostenguari buruz eta nola gaitzeaz."
#: Merge.rc:2503
#, c-format
@@ -5571,7 +5572,7 @@
#: Merge.rc:2661
#, c-format
msgid "Generate a patch-file"
-msgstr "Helburu-agiri bat sortu"
+msgstr "Eranskin-agiri bat sortu"
#: Merge.rc:2662
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-12-09 13:43:01
|
Revision: 7570
http://winmerge.svn.sourceforge.net/winmerge/?rev=7570&view=rev
Author: jtuc
Date: 2011-12-09 13:42:55 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
rev. 5587 messed up a hyphen
Modified Paths:
--------------
trunk/Docs/Users/Manual/Introduction.xml
Modified: trunk/Docs/Users/Manual/Introduction.xml
===================================================================
--- trunk/Docs/Users/Manual/Introduction.xml 2011-10-24 06:29:38 UTC (rev 7569)
+++ trunk/Docs/Users/Manual/Introduction.xml 2011-12-09 13:42:55 UTC (rev 7570)
@@ -207,7 +207,7 @@
<para>While WinMerge development has been fast in the last couple of years,
all this work is done by people in their spare time. Nobody gets paid for
improving WinMerge. We try to fix bugs as we find them or when somebody
- reports them to us. We really try â we use WinMerge too. But there are
+ reports them to us. We really try - we use WinMerge too. But there are
absolutely no promises for new features. We always appreciate any help with
WinMerge, be it testing, documenting, translating, or coding.</para>
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.
