|
From: <ki...@us...> - 2008-05-29 09:47:38
|
Revision: 5394
http://winmerge.svn.sourceforge.net/winmerge/?rev=5394&view=rev
Author: kimmov
Date: 2008-05-29 02:47:36 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Remove useless wrapper code in dlgutil. Use CMainFrame functions directly where needed.
Modified Paths:
--------------
trunk/Externals/pcre/Win32/pcreposix.vcproj
trunk/Src/LoadSaveCodepageDlg.cpp
trunk/Src/Merge.vcproj
trunk/Src/OpenDlg.cpp
Removed Paths:
-------------
trunk/Src/dlgutil.cpp
trunk/Src/dlgutil.h
Modified: trunk/Externals/pcre/Win32/pcreposix.vcproj
===================================================================
--- trunk/Externals/pcre/Win32/pcreposix.vcproj 2008-05-29 08:24:22 UTC (rev 5393)
+++ trunk/Externals/pcre/Win32/pcreposix.vcproj 2008-05-29 09:47:36 UTC (rev 5394)
@@ -1,33 +1,62 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8,00"
Name="pcreposix"
ProjectGUID="{52D81969-2CFB-4CE5-A495-18AB8999359C}"
- SccProjectName=""
- SccLocalPath=""
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="../../../Build/pcre/Debug"
IntermediateDirectory="../../../BuildTmp/pcre/pcreposix.dir/Debug"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcreposix_EXPORTS"
+ MkTypLibCompatible="false"
+ TargetEnvironment="1"
+ GenerateStublessProxies="true"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(IntDir)"
+ HeaderFileName="$(InputName).h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"
+ />
+ <Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000"
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories=".;.."
PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcreposix_EXPORTS"
- ExceptionHandling="FALSE"
+ ExceptionHandling="0"
BasicRuntimeChecks="1"
RuntimeLibrary="3"
AssemblerListingLocation="Debug"
@@ -35,10 +64,20 @@
ProgramDataBaseFileName="$(IntDir)/pcreposixd.pdb"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="1"/>
+ CompileAs="1"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcreposix_EXPORTS"
+ AdditionalIncludeDirectories=".;.."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386 /debug"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(OutDir)\pcre.lib $(NOINHERIT)"
@@ -46,67 +85,97 @@
Version="0.0"
LinkIncremental="2"
AdditionalLibraryDirectories=""
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)/pcreposixd.pdb"
- ImportLibrary="$(OutDir)/pcreposixd.lib"/>
+ ImportLibrary="$(OutDir)/pcreposixd.lib"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcreposix_EXPORTS"
- MkTypLibCompatible="FALSE"
- TargetEnvironment="1"
- GenerateStublessProxies="TRUE"
- TypeLibraryName="$(InputName).tlb"
- OutputDirectory="$(IntDir)"
- HeaderFileName="$(InputName).h"
- DLLDataFileName=""
- InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcreposix_EXPORTS"
- AdditionalIncludeDirectories=".;.."/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="../../../Build/pcre/Release"
IntermediateDirectory="../../../BuildTmp/pcre/pcreposix.dir\Release"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcreposix_EXPORTS"
+ MkTypLibCompatible="false"
+ TargetEnvironment="1"
+ GenerateStublessProxies="true"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(IntDir)"
+ HeaderFileName="$(InputName).h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"
+ />
+ <Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000"
Optimization="2"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories=".;.."
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcreposix_EXPORTS"
- ExceptionHandling="FALSE"
+ ExceptionHandling="0"
RuntimeLibrary="2"
AssemblerListingLocation="Release"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)/pcreposix.pdb"
WarningLevel="3"
- CompileAs="1"/>
+ CompileAs="1"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcreposix_EXPORTS"
+ AdditionalIncludeDirectories=".;.."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(OutDir)\pcre.lib $(NOINHERIT)"
@@ -115,65 +184,95 @@
LinkIncremental="1"
AdditionalLibraryDirectories=""
ProgramDatabaseFile="$(IntDir)/pcreposix.pdb"
- ImportLibrary="$(OutDir)/pcreposix.lib"/>
+ ImportLibrary="$(OutDir)/pcreposix.lib"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcreposix_EXPORTS"
- MkTypLibCompatible="FALSE"
- TargetEnvironment="1"
- GenerateStublessProxies="TRUE"
- TypeLibraryName="$(InputName).tlb"
- OutputDirectory="$(IntDir)"
- HeaderFileName="$(InputName).h"
- DLLDataFileName=""
- InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcreposix_EXPORTS"
- AdditionalIncludeDirectories=".;.."/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="MinSizeRel|Win32"
OutputDirectory="../../../Build/pcre/MinSizeRel"
IntermediateDirectory="../../../BuildTmp/pcre/pcreposix.dir/MinSizeRel"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcreposix_EXPORTS"
+ MkTypLibCompatible="false"
+ TargetEnvironment="1"
+ GenerateStublessProxies="true"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(IntDir)"
+ HeaderFileName="$(InputName).h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"
+ />
+ <Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000"
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".;.."
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcreposix_EXPORTS"
- ExceptionHandling="FALSE"
+ ExceptionHandling="0"
RuntimeLibrary="2"
AssemblerListingLocation="MinSizeRel"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)/pcreposix.pdb"
WarningLevel="3"
- CompileAs="1"/>
+ CompileAs="1"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcreposix_EXPORTS"
+ AdditionalIncludeDirectories=".;.."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(OutDir)\pcre.lib $(NOINHERIT)"
@@ -182,66 +281,96 @@
LinkIncremental="1"
AdditionalLibraryDirectories=""
ProgramDatabaseFile="$(IntDir)/pcreposix.pdb"
- ImportLibrary="$(OutDir)/pcreposix.lib"/>
+ ImportLibrary="$(OutDir)/pcreposix.lib"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcreposix_EXPORTS"
- MkTypLibCompatible="FALSE"
- TargetEnvironment="1"
- GenerateStublessProxies="TRUE"
- TypeLibraryName="$(InputName).tlb"
- OutputDirectory="$(IntDir)"
- HeaderFileName="$(InputName).h"
- DLLDataFileName=""
- InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcreposix_EXPORTS"
- AdditionalIncludeDirectories=".;.."/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="RelWithDebInfo|Win32"
OutputDirectory="../../../Build/pcre/RelWithDebInfo"
IntermediateDirectory="../../../BuildTmp/pcre/pcreposix.dir/RelWithDebInfo"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcreposix_EXPORTS"
+ MkTypLibCompatible="false"
+ TargetEnvironment="1"
+ GenerateStublessProxies="true"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(IntDir)"
+ HeaderFileName="$(InputName).h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"
+ />
+ <Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".;.."
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcreposix_EXPORTS"
- ExceptionHandling="FALSE"
+ ExceptionHandling="0"
RuntimeLibrary="2"
AssemblerListingLocation="RelWithDebInfo"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)/pcreposix.pdb"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="1"/>
+ CompileAs="1"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcreposix_EXPORTS"
+ AdditionalIncludeDirectories=".;.."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386 /debug"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(OutDir)\pcre.lib $(NOINHERIT)"
@@ -249,41 +378,34 @@
Version="0.0"
LinkIncremental="2"
AdditionalLibraryDirectories=""
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)/pcreposix.pdb"
- ImportLibrary="$(OutDir)/pcreposix.lib"/>
+ ImportLibrary="$(OutDir)/pcreposix.lib"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcreposix_EXPORTS"
- MkTypLibCompatible="FALSE"
- TargetEnvironment="1"
- GenerateStublessProxies="TRUE"
- TypeLibraryName="$(InputName).tlb"
- OutputDirectory="$(IntDir)"
- HeaderFileName="$(InputName).h"
- DLLDataFileName=""
- InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcreposix_EXPORTS"
- AdditionalIncludeDirectories=".;.."/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -291,55 +413,66 @@
<Files>
<Filter
Name="Source Files"
- Filter="">
+ >
<File
- RelativePath="..\pcreposix.c">
+ RelativePath="..\pcreposix.c"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="">
+ >
<File
- RelativePath="..\pcreposix.h">
+ RelativePath="..\pcreposix.h"
+ >
</File>
</Filter>
<File
- RelativePath="..\CMakeLists.txt">
+ RelativePath="..\CMakeLists.txt"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCustomBuildTool"
Description=""
CommandLine=""
AdditionalDependencies=""
- Outputs=""/>
+ Outputs=""
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCustomBuildTool"
Description=""
CommandLine=""
AdditionalDependencies=""
- Outputs=""/>
+ Outputs=""
+ />
</FileConfiguration>
<FileConfiguration
- Name="MinSizeRel|Win32">
+ Name="MinSizeRel|Win32"
+ >
<Tool
Name="VCCustomBuildTool"
Description=""
CommandLine=""
AdditionalDependencies=""
- Outputs=""/>
+ Outputs=""
+ />
</FileConfiguration>
<FileConfiguration
- Name="RelWithDebInfo|Win32">
+ Name="RelWithDebInfo|Win32"
+ >
<Tool
Name="VCCustomBuildTool"
Description=""
CommandLine=""
AdditionalDependencies=""
- Outputs=""/>
+ Outputs=""
+ />
</FileConfiguration>
</File>
</Files>
Modified: trunk/Src/LoadSaveCodepageDlg.cpp
===================================================================
--- trunk/Src/LoadSaveCodepageDlg.cpp 2008-05-29 08:24:22 UTC (rev 5393)
+++ trunk/Src/LoadSaveCodepageDlg.cpp 2008-05-29 09:47:36 UTC (rev 5394)
@@ -3,14 +3,14 @@
*
* @brief Implementation of the dialog used to select codepages
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
#include "Merge.h"
+#include "MainFrm.h"
#include "resource.h"
#include "LoadSaveCodepageDlg.h"
-#include "dlgutil.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -79,7 +79,7 @@
theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
- dlgutil_SetMainIcon(this);
+ CMainFrame::SetMainIcon(this);
// setup handler for resizing this dialog
m_constraint.InitializeCurrentSize(this);
@@ -101,7 +101,7 @@
m_constraint.SubclassWnd(); // install subclassing
m_constraint.LoadPosition(_T("ResizeableDialogs"), _T("LoadSaveCodepageDlg"), false); // persist size via registry
- dlgutil_CenterToMainFrame(this);
+ CMainFrame::CenterToMainFrame(this);
SetDlgItemText(IDC_LEFT_FILES_LABEL, m_sAffectsLeftString);
SetDlgItemText(IDC_RIGHT_FILES_LABEL, m_sAffectsRightString);
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-05-29 08:24:22 UTC (rev 5393)
+++ trunk/Src/Merge.vcproj 2008-05-29 09:47:36 UTC (rev 5394)
@@ -1920,43 +1920,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="dlgutil.cpp">
- <FileConfiguration
- Name="UnicodeRelease|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
RelativePath="Common\dllproxy.c">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -6002,9 +5965,6 @@
RelativePath="DirViewColItems.h">
</File>
<File
- RelativePath="dlgutil.h">
- </File>
- <File
RelativePath="Common\dllproxy.h">
</File>
<File
Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp 2008-05-29 08:24:22 UTC (rev 5393)
+++ trunk/Src/OpenDlg.cpp 2008-05-29 09:47:36 UTC (rev 5394)
@@ -39,7 +39,6 @@
#include "OptionsDef.h"
#include "MainFrm.h"
#include "OptionsMgr.h"
-#include "dlgutil.h"
#include "FileOrFolderSelect.h"
#ifdef COMPILE_MULTIMON_STUBS
@@ -155,7 +154,7 @@
m_constraint.SubclassWnd(); // install subclassing
m_constraint.LoadPosition(_T("ResizeableDialogs"), _T("OpenDlg"), false); // persist size via registry
- dlgutil_CenterToMainFrame(this);
+ CMainFrame::CenterToMainFrame(this);
m_ctlLeft.LoadState(_T("Files\\Left"));
m_ctlRight.LoadState(_T("Files\\Right"));
Deleted: trunk/Src/dlgutil.cpp
===================================================================
--- trunk/Src/dlgutil.cpp 2008-05-29 08:24:22 UTC (rev 5393)
+++ trunk/Src/dlgutil.cpp 2008-05-29 09:47:36 UTC (rev 5394)
@@ -1,36 +0,0 @@
-/**
- * @file dlgutil.cpp
- *
- * @brief Miscellaneous dialog utility functions
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#include "stdafx.h"
-#include "dlgutil.h"
-#include "MainFrm.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/**
- * @brief Show WinMerge icon as dialog icon
- */
-void
-dlgutil_SetMainIcon(CDialog * dlg)
-{
- CMainFrame::SetMainIcon(dlg);
-}
-
-/**
- * @brief Display new dialog in center of WinMerge main window
- */
-void
-dlgutil_CenterToMainFrame(CDialog * dlg)
-{
- CMainFrame::CenterToMainFrame(dlg);
-}
-
Deleted: trunk/Src/dlgutil.h
===================================================================
--- trunk/Src/dlgutil.h 2008-05-29 08:24:22 UTC (rev 5393)
+++ trunk/Src/dlgutil.h 2008-05-29 09:47:36 UTC (rev 5394)
@@ -1,7 +0,0 @@
-#ifndef dlgutil_h_included
-#define dlgutil_h_included
-
-void dlgutil_SetMainIcon(CDialog * dlg);
-void dlgutil_CenterToMainFrame(CDialog * dlg);
-
-#endif // dlgutil_h_included
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-29 17:54:57
|
Revision: 5396
http://winmerge.svn.sourceforge.net/winmerge/?rev=5396&view=rev
Author: kimmov
Date: 2008-05-29 10:54:51 -0700 (Thu, 29 May 2008)
Log Message:
-----------
PATCH: [ 1973149 ] Ukrainian Translation (WinMerge v2.8.0)
[ 1974021 ] Ukrainian translation for WinMerge
Submitted by Warrior and Vitaliy Stopchans'kyy
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
trunk/Installer/InnoSetup/Languages/Croatian.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Danish.isl
trunk/Installer/InnoSetup/Languages/Dutch.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Installer/InnoSetup/Languages/German.isl
trunk/Installer/InnoSetup/Languages/Greek.isl
trunk/Installer/InnoSetup/Languages/Hungarian.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Korean.isl
trunk/Installer/InnoSetup/Languages/Norwegian.isl
trunk/Installer/InnoSetup/Languages/Polish.isl
trunk/Installer/InnoSetup/Languages/Portuguese.isl
trunk/Installer/InnoSetup/Languages/Romanian.isl
trunk/Installer/InnoSetup/Languages/Russian.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Swedish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
trunk/Installer/InnoSetup/WinMerge.iss
trunk/ShellExtension/ShellExtension.rc
trunk/ShellExtension/ShellExtension.vcproj
trunk/ShellExtension/ShellExtensionX64.vcproj
Added Paths:
-----------
trunk/Docs/Users/Languages/ReadMe-Ukrainian.txt
trunk/Installer/InnoSetup/Languages/Ukrainian.isl
trunk/ShellExtension/Languages/ShellExtensionUkrainian.rc
trunk/Src/Languages/Ukrainian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Docs/Users/ChangeLog.txt 2008-05-29 17:54:51 UTC (rev 5396)
@@ -7,6 +7,7 @@
BugFix: Location Pane flickers when resizing (#1740106)
BugFix: Command line description text starting with "/" confused
WinMerge (#1973225)
+ New translation: Ukrainian (#1973149, #1974021)
WinMerge 2.9.1.2 - 2008-05-23 (r5362)
Optimize location pane (r5341, r5342, r5346, r5351, r5355, r5356)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Docs/Users/Contributors.txt 2008-05-29 17:54:51 UTC (rev 5396)
@@ -112,7 +112,11 @@
* Turkish:
Ozkan UNVER
+* Ukranian
+ Vitaliy Stopchans'kyy
+ Warrior
+
Other Contributors (code, ideas, testing..):
* Andre Arpin
* Steve Beaudoin
Added: trunk/Docs/Users/Languages/ReadMe-Ukrainian.txt
===================================================================
--- trunk/Docs/Users/Languages/ReadMe-Ukrainian.txt (rev 0)
+++ trunk/Docs/Users/Languages/ReadMe-Ukrainian.txt 2008-05-29 17:54:51 UTC (rev 5396)
@@ -0,0 +1,58 @@
+WINMERGE
+
+WinMerge \xBA \xE2\xB3\xEB\xFC\xED\xEE\xFE (Open Source) \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEE\xFE \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE0 \xEE\xE1'\xBA\xE4\xED\xE0\xED\xED\xFF, \xFF\xEA\xE0
+\xEF\xF0\xE0\xF6\xFE\xBA \xED\xE0 \xF3\xF1\xB3\xF5 \xF1\xF3\xF7\xE0\xF1\xED\xE8\xF5 \xE2\xE5\xF0\xF1\xB3\xFF\xF5 Windows. \xC4\xE5\xFF\xEA\xB3 \xF4\xF3\xED\xEA\xF6\xB3\xBF \xEF\xEE\xF2\xF0\xE5\xE1\xF3\xFE\xF2\xFC \xE2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF
+\xE4\xEE\xE4\xE0\xF2\xEA\xEE\xE2\xE8\xF5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xB3\xE2.
+
+\xCE\xF1\xF2\xE0\xED\xED\xFF \xE2\xE5\xF0\xF1\xB3\xFF WinMerge \xF2\xE0 \xB3\xED\xF8\xE0 \xB3\xED\xF4\xEE\xF0\xEC\xE0\xF6\xB3\xFF \xEF\xF0\xEE WinMerge \xE4\xEE\xF1\xF2\xF3\xEF\xED\xE0 \xE7\xE0 \xE0\xE4\xF0\xE5\xF1\xEE\xFE
+http://winmerge.org
+
+\xCF\xEE\xF7\xE0\xF2\xEE\xEA \xF0\xEE\xE1\xEE\xF2\xE8 \xE7 WinMerge:
+\xD9\xEE\xE4\xEE \xF6\xFC\xEE\xE3\xEE \xF7\xE8\xF2\xE0\xE9\xF2\xE5 \xE2\xB3\xE4\xEF\xEE\xE2\xB3\xE4\xED\xE8\xE9 \xF0\xEE\xE7\xE4\xB3\xEB \xEE\xED\xEB\xE0\xE9\xED-\xE4\xEE\xE2\xB3\xE4\xEA\xE8 WinMerge:
+http://www.winmerge.org/2.8/manual/quickstart.html
+
+HTML-\xE4\xEE\xE2\xB3\xE4\xEA\xE0:
+\xC4\xEE\xE2\xB3\xE4\xEA\xE0 \xE4\xEE\xF1\xF2\xF3\xEF\xED\xE0 \xEE\xED\xEB\xE0\xE9\xED
+http://www.winmerge.org/2.8/manual/
+\xBF\xBF \xF2\xE0\xEA\xEE\xE6 \xEC\xEE\xE6\xED\xE0 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 (\xFF\xEA\xF9\xEE \xEE\xE1\xF0\xE0\xED\xEE) \xEB\xEE\xEA\xE0\xEB\xFC\xED\xEE \xF2\xE0 \xE7\xE0\xE2\xE0\xED\xF2\xE0\xE6\xE8\xF2\xE8 \xEE\xEA\xF0\xE5\xEC\xEE \xE7
+http://www.winmerge.org/ (\xE4\xE8\xE2. \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xB3\xFE)
+
+ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0 \xE0\xF0\xF5\xB3\xE2\xB3\xE2:
+\xC4\xEB\xFF \xEF\xB3\xE4\xF2\xF0\xE8\xEC\xEA\xE8 \xF4\xE0\xE9\xEB\xB3\xE2 \xE0\xF0\xF5\xB3\xE2\xB3\xE2 WinMerge \xE2\xE8\xEA\xEE\xF0\xE8\xF1\xF2\xEE\xE2\xF3\xBA 7-Zip. 7-Zip
+(http://www.7-zip.org) \xBA \xE2\xB3\xEB\xFC\xED\xE8\xEC (Open Source) \xB3\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xEE\xEC \xE0\xF0\xF5\xB3\xE2\xF3\xE2\xE0\xED\xED\xFF. \xD9\xEE\xE1
+\xE2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 \xEF\xB3\xE4\xF2\xF0\xE8\xEC\xEA\xF3 \xE7\xE0\xE0\xF0\xF5\xB3\xE2\xEE\xE2\xE0\xED\xE8\xF5 \xF4\xE0\xE9\xEB\xB3\xE2, \xE7\xE0\xE2\xE0\xED\xF2\xE0\xE6\xF2\xE5 \xB3\xED\xF1\xF2\xE0\xEB\xFF\xF2\xEE\xF0 \xEC\xEE\xE4\xF3\xEB\xFF 7-Zip \xE7
+\xF1\xE0\xE9\xF2\xF3 http://www.winmerge.org/
+
+\xC2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF \xEF\xB3\xE4\xF2\xF0\xE8\xEC\xEA\xE8 \xE0\xF0\xF5\xB3\xE2\xB3\xE2:
+\xC1\xE0\xE6\xE0\xED\xEE \xE2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xF3 7-Zip. \xDF\xEA\xF9\xEE \xE7 \xEF\xE5\xE2\xED\xE8\xF5 \xEF\xF0\xE8\xF7\xE8\xED \xF6\xFC\xEE\xE3\xEE \xED\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE7\xF0\xEE\xE1\xE8\xF2\xE8,
+\xF2\xEE\xE4\xB3 \xB3\xED\xF1\xF2\xE0\xEB\xFF\xF2\xEE\xF0 \xEC\xEE\xE4\xF3\xEB\xFF 7-zip \xEC\xEE\xE6\xE5 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 \xEB\xE8\xF8\xE5 \xF4\xE0\xE9\xEB\xE8, \xED\xE5\xEE\xE1\xF5\xB3\xE4\xED\xB3 \xE4\xEB\xFF \xEF\xB3\xE4\xF2\xF0\xE8\xEC\xEA\xE8
+\xE7\xE0\xE0\xF0\xF5\xB3\xE2\xEE\xE2\xE0\xED\xE8\xF5 \xF4\xE0\xE9\xEB\xB3\xE2. \xCC\xE0\xE9\xF2\xE5 \xED\xE0 \xF3\xE2\xE0\xE7\xB3, \xF9\xEE \xE2 \xF2\xE0\xEA\xEE\xEC\xF3 \xE2\xE8\xEF\xE0\xE4\xEA\xF3 \xEE\xEA\xF0\xE5\xEC\xE5 \xE2\xE8\xEA\xEE\xF0\xE8\xF1\xF2\xE0\xED\xED\xFF
+7-Zip \xCD\xC5\xCC\xCE\xC6\xCB\xC8\xC2\xC5, \xE0 \xEC\xEE\xE6\xEB\xE8\xE2\xE0 \xEB\xE8\xF8\xE5 \xEF\xB3\xE4\xF2\xF0\xE8\xEC\xEA\xE0 \xE0\xF0\xF5\xB3\xE2\xB3\xE2 \xE4\xEB\xFF WinMerge.
+
+ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0 \xF1\xEA\xF0\xE8\xEF\xF2\xB3\xE2:
+\xDF\xEA\xF9\xEE \xE1\xE0\xE6\xE0\xBA\xF2\xE5 \xEF\xF0\xE0\xF6\xFE\xE2\xE0\xF2\xE8 \xE7\xB3 \xF1\xEA\xF0\xE8\xEF\xF2\xE0\xEC\xE8, \xF2\xEE \xE4\xEB\xFF \xF6\xFC\xEE\xE3\xEE \xED\xE5\xEE\xE1\xF5\xB3\xE4\xED\xEE \xEC\xE0\xF2\xE8 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xE8\xE9
+Windows Scripting Host. \xDF\xEA\xF9\xEE \xE2\xE8\xED\xE8\xEA\xE0\xFE\xF2\xFC \xFF\xEA\xB3\xF1\xFC \xEF\xEE\xEC\xE8\xEB\xEA\xE8, \xF9\xEE \xF1\xF2\xEE\xF1\xF3\xFE\xF2\xFC\xF1\xFF \xC2\xE0\xF8\xE8\xF5
+\xF1\xEA\xF0\xE8\xEF\xF2\xB3\xE2, \xF2\xEE\xE4\xB3 \xE2\xB3\xE4\xE2\xB3\xE4\xE0\xE9\xF2\xE5
+http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
+\xF9\xEE\xE1 \xEF\xE5\xF0\xE5\xEA\xEE\xED\xE0\xF2\xE8\xF1\xFF, \xF9\xEE \xC2\xE0\xF8 Scripting Host \xBA \xEE\xF1\xF2\xE0\xED\xED\xFC\xEE\xBF \xE2\xE5\xF0\xF1\xB3\xBF \xB3 \xED\xE5\xF3\xF8\xEA\xEE\xE4\xE6\xE5\xED\xE8\xE9.
+
+ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0:
+\xD0\xEE\xE7\xF0\xEE\xE1\xED\xE8\xEA\xE8 \xE2\xB3\xE4\xEF\xEE\xE2\xB3\xE4\xE0\xFE\xF2\xFC \xED\xE0 \xE7\xE0\xEF\xE8\xF2\xE0\xED\xED\xFF \xF3 \xF4\xEE\xF0\xF3\xEC\xB3 WinMerge \xED\xE0 Sourceforge.net:
+http://sourceforge.net/forum/?group_id=13216
+
+\xC1\xE0\xB4\xE8 \xF2\xE0 \xEF\xF0\xEE\xF5\xE0\xED\xED\xFF \xEF\xF0\xEE \xF4\xF3\xED\xEA\xF6\xB3\xBF:
+\xCF\xEE\xE2\xB3\xE4\xEE\xEC\xEB\xE5\xED\xED\xFF \xEF\xF0\xEE \xE1\xE0\xB4\xE8 \xF2\xE0 \xEF\xF0\xEE\xF5\xE0\xED\xED\xFF \xEF\xF0\xEE \xED\xEE\xE2\xB3 \xF4\xF3\xED\xF6\xB3\xBF \xEC\xEE\xE6\xED\xE0 \xE7\xE0\xEB\xE8\xF8\xE0\xF2\xE8 \xF3 \xE2\xB3\xE4\xF1\xF2\xE5\xE6\xF3\xE2\xE0\xF7\xE0\xF5
+RFE \xF2\xE0 \xE1ള\xE2 \xED\xE0 sourceforge.net.
+
+³\xE4\xF1\xF2\xE5\xE6\xF3\xE2\xE0\xF7 \xE1ള\xE2:
+http://sourceforge.net/tracker/?group_id=13216&atid=113216
+\xCF\xF0\xE8 \xF1\xEF\xEE\xE2\xB3\xF9\xE5\xED\xED\xB3 \xEF\xF0\xEE \xE1\xE0\xB4\xE8 \xEE\xE1\xEE\xE2'\xFF\xE7\xEA\xEE\xE2\xEE \xE2\xEA\xE0\xE7\xF3\xE9\xF2\xE5 \xF1\xE2\xEE\xFE \xE2\xE5\xF0\xF1\xB3\xFE WinMerge!
+WinMerge \xE2\xE5\xF0\xF1\xB3\xBF 2.2.0 \xF2\xE0 \xED\xEE\xE2\xB3\xF8\xEE\xBF \xEC\xEE\xE6\xE5 \xE2\xE8\xE2\xEE\xE4\xE8\xF2\xE8 "\xC6\xF3\xF0\xED\xE0\xEB \xEA\xEE\xED\xF4\xB3\xB4\xF3\xF0\xE0\xF6\xB3\xBF" \xE7 \xEC\xE5\xED\xFE
+\xC4\xEE\xE2\xB3\xE4\xEA\xE0 -> \xCA\xEE\xED\xF4\xB3\xB4\xF3\xF0\xE0\xF6\xB3\xFF. \xC4\xEE\xEB\xF3\xF7\xB3\xF2\xFC \xF6\xFE \xB3\xED\xF4\xEE\xF0\xEC\xE0\xF6\xB3\xFE (\xFF\xEA \xF4\xE0\xE9\xEB-\xE4\xEE\xEB\xF3\xF7\xE5\xED\xED\xFF) \xE4\xEE
+\xF1\xEF\xEE\xE2\xB3\xF9\xE5\xED\xED\xFF \xEF\xF0\xEE \xE1\xE0\xB4, \xE1\xEE \xE2\xB3\xED \xEC\xB3\xF1\xF2\xE8\xF2\xFC \xE1\xE0\xE3\xE0\xF2\xEE \xEA\xEE\xF0\xE8\xF1\xED\xEE\xBF \xE4\xEB\xFF \xF0\xEE\xE7\xF0\xEE\xE1\xED\xE8\xEA\xB3\xE2 \xB3\xED\xF4\xEE\xF0\xEC\xE0\xF6\xB3\xBF.
+
+³\xE4\xF1\xF2\xE5\xE6\xF3\xE2\xE0\xF7 RFE (\xE7\xE0\xEF\xE8\xF2 \xED\xEE\xE2\xEE\xBF \xF4\xF3\xED\xF6\xB3\xBF):
+http://sourceforge.net/tracker/?group_id=13216&atid=363216
+
+
+- \xD0\xEE\xE7\xF0\xEE\xE1\xED\xE8\xEA\xE8 WinMerge
Property changes on: trunk/Docs/Users/Languages/ReadMe-Ukrainian.txt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -377,6 +377,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -362,6 +362,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -345,6 +345,7 @@
SpanishLanguage=Men\xFAs i di\xE0legs en Castell\xE0
SwedishLanguage=Men\xFAs i di\xE0legs en Suec
TurkishLanguage=Men\xFAs i di\xE0legs en Turc
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Habilita la integraci\xF3 del men\xFA de contexte a l'Explorador
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -352,6 +352,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -359,6 +359,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Croatian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Croatian.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Croatian.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -355,6 +355,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Integracija u Explorer kontekst izbornik
Modified: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -360,6 +360,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Danish.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Danish.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -361,6 +361,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Dutch.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Dutch.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -339,6 +339,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -362,6 +362,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -354,6 +354,7 @@
SpanishLanguage=Menus et dialogues Espagnol
SwedishLanguage=Menus et dialogues Su\xE9dois
TurkishLanguage=Menus et dialogues Turque
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Permetre l'int\xE9gration au menu contextuel de l'explorateur
Modified: trunk/Installer/InnoSetup/Languages/German.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/German.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/German.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -351,6 +351,7 @@
SpanishLanguage=Spanische Men\xFCs und Dialoge
SwedishLanguage=Schwedische Men\xFCs und Dialoge
TurkishLanguage=T\xFCrkische Men\xFCs und Dialoge
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Explorer Kontextmen\xFC-Integration aktivieren
Modified: trunk/Installer/InnoSetup/Languages/Greek.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Greek.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Greek.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -360,6 +360,7 @@
SpanishLanguage=\xC9\xF3\xF0\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SwedishLanguage=\xD3\xEF\xF5\xE7\xE4\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
TurkishLanguage=\xD4\xEF\xF5\xF1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=\xC5\xED&\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 \xE5\xED\xF3\xF9\xEC\xE1\xF4\xFE\xF3\xE5\xF9\xF2 \xF3\xF4\xE9\xF2 \xE5\xE9\xE4\xE9\xEA\xDD\xF2 \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xF4\xE7\xF2 \xE5\xEE\xE5\xF1\xE5\xF5\xED\xDE\xF3\xE5\xF9\xF2
Modified: trunk/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Hungarian.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Hungarian.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -381,6 +381,7 @@
SpanishLanguage=Spanyol men\xFCk \xE9s p\xE1rbesz\xE9dablakok
SwedishLanguage=Sv\xE9d men\xFCk \xE9s p\xE1rbesz\xE9dablakok
TurkishLanguage=t\xF6r\xF6k men\xFCk \xE9s p\xE1rbesz\xE9dablakok
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=Integr\xE1l\xE1s az Int\xE9z\xF5 &context-men\xFCj\xE9hez
Modified: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -365,6 +365,7 @@
SpanishLanguage=Menu e finestre di dialogo in spagnolo
SwedishLanguage=Menu e finestre di dialogo in svedese
TurkishLanguage=Menu e finestre di dialogo in turco
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Attiva l'integrazione con il menu contestuale di Explorer
Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -354,6 +354,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=\x83G\x83N\x83X\x83v\x83\x8D\x81[\x83\x89\x82̃R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&E)
Modified: trunk/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Korean.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Korean.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -366,6 +366,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Norwegian.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Norwegian.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -358,6 +358,7 @@
SpanishLanguage=Spanske menyer og dialoger
SwedishLanguage=Svenske menyer og dialoger
TurkishLanguage=T\xFCrk\xE7e menyer og dialoger
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Aktiver integrasjon i Windows utforsker sin kontekstmeny
Modified: trunk/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Polish.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Polish.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -351,6 +351,7 @@
SpanishLanguage=Hiszpanski interfejs
SwedishLanguage=Szwedzki interfejs
TurkishLanguage=turecki interfejs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Wlacz integracje z menu Eksploratora
Modified: trunk/Installer/InnoSetup/Languages/Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Portuguese.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Portuguese.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -343,6 +343,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Romanian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Romanian.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Romanian.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -362,6 +362,7 @@
SpanishLanguage=Meniuri si dialoguri \xEEn Spaniola
SwedishLanguage=Meniuri si dialoguri \xEEn Suedeza
TurkishLanguage=Meniuri si dialoguri \xEEn Turca
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Activeaza integrarea in meniurile contextuale Explorer
Modified: trunk/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Russian.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Russian.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -349,6 +349,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -290,6 +290,7 @@
SpanishLanguage=\x8Apanielske ponuky a dial\xF3gy
SwedishLanguage=\x8Av\xE9dske ponuky a dial\xF3gy
TurkishLanguage=Tureck\xE9 ponuky a dial\xF3gy
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Zapni integr\xE1ciu do kontextovej ponuky Prieskumn\xEDka
Modified: trunk/Installer/InnoSetup/Languages/Spanish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Spanish.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Spanish.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -358,6 +358,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -352,6 +352,7 @@
SpanishLanguage=Spanska menyer och dialoger
SwedishLanguage=Svenska menyer och dialoger
TurkishLanguage=Turkiska menyer och dialoger
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&M\xF6jligg\xF6r integration med Explorers menyer
Modified: trunk/Installer/InnoSetup/Languages/Turkish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Turkish.isl 2008-05-29 10:46:23 UTC (rev 5395)
+++ trunk/Installer/InnoSetup/Languages/Turkish.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -354,6 +354,7 @@
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
Added: trunk/Installer/InnoSetup/Languages/Ukrainian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Ukrainian.isl (rev 0)
+++ trunk/Installer/InnoSetup/Languages/Ukrainian.isl 2008-05-29 17:54:51 UTC (rev 5396)
@@ -0,0 +1,381 @@
+ ; *** Inno Setup version 5.1.11+ Ukrainian messages ***
+ ;
+ ; ******software translate & patching, programming******
+ ; *\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0*
+ ; *\xB0۰\xB0\xDB۰\xB0۰\xB0\xDB\xDB\xDB\xDB۰\xB0\xDB\xDB\xDB\xDB۰\xB0\xB0\xDB\xDB\xDB\xDB۰\xB0\xB0\xDB۰\xB0\xDB\xDB\xDB\xDB۰\xB0\xDB\xDB\xDB\xDB۰\xB0*
+ ; *\xB0۰\xB0\xDB۰\xB0۰\xB0\xDB۰\xB0۰\xB0\xDB۰\xB0۰\xB0\xB0\xDB۰\xB0۰\xB0\xB0\xDB۰\xB0\xDB۰\xB0۰\xB0\xDB۰\xB0۰\xB0*
+ ; *\xB0۰\xB0\xDB۰\xB0۰\xB0\xDB\xDB\xDB\xDB۰\xB0\xDB\xDB\xDB\xDB۰\xB0\xB0\xDB\xDB\xDB\xDB۰\xB0\xB0\xDB۰\xB0\xDB۰\xB0۰\xB0\xDB\xDB\xDB\xDB۰\xB0*
+ ; *\xB0۰\xB0\xDB۰\xB0۰\xB0\xDB۰\xB0۰\xB0\xDB۰\xB0\xDB۰\xB0\xDB۰\xB0\xDB۰\xB0\xDB۰\xB0\xDB۰\xB0۰\xB0\xDB۰\xB0\xDB۰*
+ ; *\xB0\xDB\xDB۰\xB0\xDB\xDB۰\xB0\xDB۰\xB0۰\xB0\xDB۰\xB0\xB0۰\xB0\xDB۰\xB0\xB0۰\xB0\xDB۰\xB0\xDB\xDB\xDB\xDB۰\xB0\xDB۰\xB0\xB0۰*
+ ; *\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0\xB0*
+ ; ----bestwishesforyou----warr11r----Rivne-----2008----
+ ;
+ ; Translation was made by Warrior, http://www.warr11r.mylivepage.com/
+ ; The highest accuracy was the first priority.
+ ;
+ ; Note: When translating this text, do not add periods (.) to the end of
+ ; messages that didn't have them already, because on those messages Inno
+ ; Setup adds the periods automatically (appending a period would result in
+ ; two periods being displayed).
+ ;
+
+ [LangOptions]
+ LanguageName=<0423><043A><0440><0430><0457><043D><0441><044C><043A><0430>
+ LanguageID=$0422
+ LanguageCodePage=1251
+
+ [Messages]
+
+ ; *** Application titles
+ SetupAppTitle=\xC2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF
+ SetupWindowTitle=\xC2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF - %1
+ UninstallAppTitle=\xC2\xE8\xEB\xF3\xF7\xE5\xED\xED\xFF
+ UninstallAppFullTitle=\xC2\xE8\xEB\xF3\xF7\xE5\xED\xED\xFF - %1
+
+ ; *** Misc. common
+ InformationTitle=\xB2\xED\xF4\xEE\xF0\xEC\xE0\xF6\xB3\xFF
+ ConfirmTitle=ϳ\xE4\xF2\xE2\xE5\xF0\xE4\xE6\xE5\xED\xED\xFF
+ ErrorTitle=\xCF\xEE\xEC\xE8\xEB\xEA\xE0
+
+ ; *** SetupLdr messages
+ SetupLdrStartupMessage=\xD6\xFF \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC %1 \xED\xE0 \xC2\xE0\xF8 \xEA\xEE\xEC\xEF'\xFE\xF2\xE5\xF0, \xEF\xF0\xEE\xE4\xEE\xE2\xE6\xE8\xF2\xE8?
+ LdrCannotCreateTemp=\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xF2\xE8\xEC\xF7\xE0\xF1\xEE\xE2\xE8\xE9 \xF4\xE0\xE9\xEB. \xC2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF \xEF\xE5\xF0\xE5\xF0\xE2\xE0\xED\xE5
+ LdrCannotExecTemp=\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE2\xE8\xEA\xEE\xED\xE0\xF2\xE8 \xF4\xE0\xE9\xEB \xF3 \xF2\xE8\xEC\xF7\xE0\xF1\xEE\xE2\xEE\xEC\xF3 \xEA\xE0\xF2\xE0\xEB\xEE\xE7\xB3. \xC2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF \xEF\xE5\xF0\xE5\xF0\xE2\xE0\xED\xE5
+
+ ; *** Startup error messages
+ LastErrorMessage=%1. %n%n\xCF\xEE\xEC\xE8\xEB\xEA\xE0 %2: %3
+ SetupFileMissing=\xD4\xE0\xE9\xEB %1 \xE2\xB3\xE4\xF1\xF3\xF2\xED\xB3\xE9 \xF3 \xEF\xE0\xEF\xF6\xB3 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF. \xC1\xF3\xE4\xFC \xEB\xE0\xF1\xEA\xE0, \xF3\xF1\xF3\xED\xFC\xF2\xE5 \xEF\xF0\xEE\xE1\xEB\xE5\xEC\xF3 \xE0\xE1\xEE \xEE\xF2\xF0\xE8\xEC\xE0\xE9\xF2\xE5 \xED\xEE\xE2\xF3 \xE2\xE5\xF0\xF1\xB3\xFE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE8.
+ SetupFileCorrupt=\xD4\xE0\xE9\xEB\xE8 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF \xEF\xEE\xF8\xEA\xEE\xE4\xE6\xE5\xED\xB3. \xC1\xF3\xE4\xFC \xEB\xE0\xF1\xEA\xE0, \xEE\xF2\xF0\xE8\xEC\xE0\xE9\xF2\xE5 \xED\xEE\xE2\xF3 \xEA\xEE\xEF\xB3\xFE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE8.
+ SetupFileCorruptOrWrongVer=ֳ \xF4\xE0\xE9...
[truncated message content] |
|
From: <ki...@us...> - 2008-05-30 06:26:42
|
Revision: 5400
http://winmerge.svn.sourceforge.net/winmerge/?rev=5400&view=rev
Author: kimmov
Date: 2008-05-29 23:26:40 -0700 (Thu, 29 May 2008)
Log Message:
-----------
BUG: [ 1602313 ] WinMerge stays in tasklist after closing
Remove unneeded WM_CLOSE handler CMergeEditView::OnWindowClose()
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeEditView.cpp
trunk/Src/MergeEditView.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-05-29 22:04:54 UTC (rev 5399)
+++ trunk/Docs/Users/ChangeLog.txt 2008-05-30 06:26:40 UTC (rev 5400)
@@ -5,6 +5,7 @@
WinMerge 2.9.1.3
Update PCRE (regular expression library) to version 7.7 (#1941779)
Add VB.net keywords to Basic highlighter (#1970912)
+ Possible improvement for WinMerge exit bug (#1602313)
BugFix: Location Pane flickers when resizing (#1740106)
BugFix: Command line description text starting with "/" confused
WinMerge (#1973225)
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2008-05-29 22:04:54 UTC (rev 5399)
+++ trunk/Src/MergeEditView.cpp 2008-05-30 06:26:40 UTC (rev 5400)
@@ -171,7 +171,6 @@
ON_COMMAND(ID_FILE_MERGINGMODE, OnMergingMode)
ON_UPDATE_COMMAND_UI(ID_FILE_MERGINGMODE, OnUpdateMergingMode)
ON_UPDATE_COMMAND_UI(ID_STATUS_MERGINGMODE, OnUpdateMergingStatus)
- ON_COMMAND(ID_FILE_CLOSE, OnWindowClose)
ON_WM_VSCROLL ()
ON_WM_HSCROLL ()
ON_COMMAND(ID_EDIT_COPY_LINENUMBERS, OnEditCopyLineNumbers)
@@ -2576,17 +2575,6 @@
}
/**
- * @brief Called when user selects Window/Close.
- * Route closing to CMainFrame::OnClose().
- * @todo We probably should just remove this OnClose() handling for
- * CMergeEditView and handle it in CMainFrame.
- */
-void CMergeEditView::OnWindowClose()
-{
- GetParentFrame()->PostMessage(WM_CLOSE, 0, 0);
-}
-
-/**
* @brief Check for horizontal scroll. Re-route to CSplitterEx if not from
* a scroll bar.
*/
Modified: trunk/Src/MergeEditView.h
===================================================================
--- trunk/Src/MergeEditView.h 2008-05-29 22:04:54 UTC (rev 5399)
+++ trunk/Src/MergeEditView.h 2008-05-30 06:26:40 UTC (rev 5400)
@@ -280,7 +280,6 @@
afx_msg void OnMergingMode();
afx_msg void OnUpdateMergingMode(CCmdUI* pCmdUI);
afx_msg void OnUpdateMergingStatus(CCmdUI* pCmdUI);
- afx_msg void OnWindowClose();
afx_msg void OnHScroll (UINT nSBCode, UINT nPos, CScrollBar * pScrollBar);
afx_msg void OnVScroll (UINT nSBCode, UINT nPos, CScrollBar * pScrollBar);
afx_msg void OnEditCopyLineNumbers();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-01 17:45:51
|
Revision: 5411
http://winmerge.svn.sourceforge.net/winmerge/?rev=5411&view=rev
Author: kimmov
Date: 2008-06-01 10:45:44 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
PATCH: [ 1980970 ] Swedish.isl translation update for Ukrainian language
Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/Languages/Swedish.isl
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-01 16:45:16 UTC (rev 5410)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-01 17:45:44 UTC (rev 5411)
@@ -10,6 +10,8 @@
BugFix: Command line description text starting with "/" confused
WinMerge (#1973225)
New translation: Ukrainian (#1973149, #1974021)
+ Translation updates:
+ - Swedish (#1980970)
WinMerge 2.9.1.2 - 2008-05-23 (r5362)
Optimize location pane (r5341, r5342, r5346, r5351, r5355, r5356)
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-06-01 16:45:16 UTC (rev 5410)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-06-01 17:45:44 UTC (rev 5411)
@@ -352,7 +352,7 @@
SpanishLanguage=Spanska menyer och dialoger
SwedishLanguage=Svenska menyer och dialoger
TurkishLanguage=Turkiska menyer och dialoger
-UkrainianLanguage=Ukrainian menus and dialogs
+UkrainianLanguage=Ukrainska menyer och dialoger
;Tasks
ExplorerContextMenu=&M\xF6jligg\xF6r integration med Explorers menyer
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-06-03 21:25:36
|
Revision: 5419
http://winmerge.svn.sourceforge.net/winmerge/?rev=5419&view=rev
Author: gerundt
Date: 2008-06-03 14:25:17 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
BUG: [ 1976480 ] Mini-Bug: "Differences found"-label is not refreshed...
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/ChildFrm.cpp
trunk/Src/DirView.cpp
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-03 21:08:21 UTC (rev 5418)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-03 21:25:17 UTC (rev 5419)
@@ -7,8 +7,9 @@
Add VB.net keywords to Basic highlighter (#1970912)
Possible improvement for WinMerge exit bug (#1602313)
BugFix: Location Pane flickers when resizing (#1740106)
- BugFix: Command line description text starting with "/" confused
+ BugFix: Command line description text starting with "/" confused
WinMerge (#1973225)
+ BugFix: Item count in statusbar not get cleared (#1976480)
New translation: Ukrainian (#1973149, #1974021)
Translation updates:
- Swedish (#1980970)
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2008-06-03 21:08:21 UTC (rev 5418)
+++ trunk/Src/ChildFrm.cpp 2008-06-03 21:25:17 UTC (rev 5419)
@@ -540,6 +540,8 @@
{
// clean up pointers.
CMDIChildWnd::OnClose();
+
+ GetMainFrame()->ClearStatusbarItemCount();
}
void CChildFrame::OnSize(UINT nType, int cx, int cy)
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2008-06-03 21:08:21 UTC (rev 5418)
+++ trunk/Src/DirView.cpp 2008-06-03 21:25:17 UTC (rev 5419)
@@ -846,6 +846,8 @@
SaveColumnWidths();
CListView::OnDestroy();
+
+ GetMainFrame()->ClearStatusbarItemCount();
}
/**
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-06-03 21:08:21 UTC (rev 5418)
+++ trunk/Src/MainFrm.cpp 2008-06-03 21:25:17 UTC (rev 5419)
@@ -1956,6 +1956,12 @@
return old;
}
+// Clear the item count in the main status pane
+void CMainFrame::ClearStatusbarItemCount()
+{
+ m_wndStatusBar.SetPaneText(2, _T(""));
+}
+
/**
* @brief Generate patch from files selected.
*
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2008-06-03 21:08:21 UTC (rev 5418)
+++ trunk/Src/MainFrm.h 2008-06-03 21:25:17 UTC (rev 5419)
@@ -118,6 +118,7 @@
BOOL CreateBackup(BOOL bFolder, LPCTSTR pszPath);
int HandleReadonlySave(CString& strSavePath, BOOL bMultiFile, BOOL &bApplyToAll);
CString SetStatus(LPCTSTR status);
+ void ClearStatusbarItemCount();
void ApplyViewWhitespace();
void OpenFileToExternalEditor(LPCTSTR file);
void SetEOLMixed(BOOL bAllow);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-05 12:48:21
|
Revision: 5426
http://winmerge.svn.sourceforge.net/winmerge/?rev=5426&view=rev
Author: kimmov
Date: 2008-06-05 05:48:16 -0700 (Thu, 05 Jun 2008)
Log Message:
-----------
PATCH: [ 1984884 ] Allow drag&drop conflict files to main window
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-04 16:54:04 UTC (rev 5425)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-05 12:48:16 UTC (rev 5426)
@@ -5,6 +5,7 @@
WinMerge 2.9.1.3
Update PCRE (regular expression library) to version 7.7 (#1941779)
Add VB.net keywords to Basic highlighter (#1970912)
+ Opening conflict files by drag & dropping to main window (#1984884)
Possible improvement for WinMerge exit bug (#1602313)
BugFix: Location Pane flickers when resizing (#1740106)
BugFix: Command line description text starting with "/" confused
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-06-04 16:54:04 UTC (rev 5425)
+++ trunk/Src/MainFrm.cpp 2008-06-05 12:48:16 UTC (rev 5426)
@@ -2123,10 +2123,18 @@
files[0], files[1]);
// Check if they dropped a project file
- if (wNumFilesDropped == 1 && theApp.IsProjectFile(files[0]))
+ if (wNumFilesDropped == 1)
{
- theApp.LoadAndOpenProjectFile(files[0]);
- return;
+ if (theApp.IsProjectFile(files[0]))
+ {
+ theApp.LoadAndOpenProjectFile(files[0]);
+ return;
+ }
+ if (IsConflictFile((LPCTSTR)files[0]))
+ {
+ DoOpenConflict((LPCTSTR)files[0], true);
+ return;
+ }
}
DoFileOpen(files[0], files[1], FFILEOPEN_NONE, FFILEOPEN_NONE, ctrlKey);
@@ -3389,20 +3397,24 @@
* modified by default so user can just save it and accept workspace
* file as resolved file.
* @param [in] conflictFile Full path to conflict file to open.
+ * @param [in] checked If true, do not check if it really is project file.
* @return TRUE if conflict file was opened for resolving.
*/
-BOOL CMainFrame::DoOpenConflict(LPCTSTR conflictFile)
+BOOL CMainFrame::DoOpenConflict(LPCTSTR conflictFile, bool checked)
{
BOOL conflictCompared = FALSE;
String confl = (LPCTSTR)conflictFile;
- bool confFile = IsConflictFile(confl);
- if (!confFile)
+ if (!checked)
{
- CString message;
- LangFormatString1(message, IDS_NOT_CONFLICT_FILE, confl.c_str());
- AfxMessageBox(message, MB_ICONSTOP);
- return FALSE;
+ bool confFile = IsConflictFile(confl);
+ if (!confFile)
+ {
+ CString message;
+ LangFormatString1(message, IDS_NOT_CONFLICT_FILE, confl.c_str());
+ AfxMessageBox(message, MB_ICONSTOP);
+ return FALSE;
+ }
}
// Create temp files and put them into the list,
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2008-06-04 16:54:04 UTC (rev 5425)
+++ trunk/Src/MainFrm.h 2008-06-05 12:48:16 UTC (rev 5426)
@@ -131,7 +131,7 @@
static void SetMainIcon(CDialog * dlg);
void StartFlashing();
bool AskCloseConfirmation();
- BOOL DoOpenConflict(LPCTSTR conflictFile);
+ BOOL DoOpenConflict(LPCTSTR conflictFile, bool checked = false);
// Overrides
virtual void GetMessageString(UINT nID, CString& rMessage) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-05 16:21:37
|
Revision: 5430
http://winmerge.svn.sourceforge.net/winmerge/?rev=5430&view=rev
Author: kimmov
Date: 2008-06-05 09:21:35 -0700 (Thu, 05 Jun 2008)
Log Message:
-----------
PATCH: [ 1978374 ] Brazilian Portuguese translation update
Submitted by Felipe Periard Lopes
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/WinMerge.iss
trunk/ShellExtension/Languages/ShellExtensionBrazilian.rc
trunk/Src/Languages/Brazilian.po
Added Paths:
-----------
trunk/Docs/Users/Languages/ReadMe-Brazilian.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-05 13:46:11 UTC (rev 5429)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-05 16:21:35 UTC (rev 5430)
@@ -13,6 +13,7 @@
BugFix: Item count in statusbar not get cleared (#1976480)
New translation: Ukrainian (#1973149, #1974021)
Translation updates:
+ - Brazilian (#1978374)
- Korean (#1978362)
- Swedish (#1980970)
Added: trunk/Docs/Users/Languages/ReadMe-Brazilian.txt
===================================================================
--- trunk/Docs/Users/Languages/ReadMe-Brazilian.txt (rev 0)
+++ trunk/Docs/Users/Languages/ReadMe-Brazilian.txt 2008-06-05 16:21:35 UTC (rev 5430)
@@ -0,0 +1,38 @@
+WINMERGE
+
+WinMerge \xE9 um utilit\xE1rio de compara\xE7\xE3o e uni\xE3o de arquivos com o c\xF3digo fonte aberto o qual roda em todas as vers\xF5es modernas do windows. Algumas fun\xE7\xF5es requerem instala\xE7\xF5es ou componentes adicionais. A \xFAltima vers\xE3o do WinMerge e outras informa\xE7\xF5es do WinMerge est\xE3o dispon\xEDveis em
+http://winmerge.org
+
+ In\xEDcio r\xE1pido para o WinMerge: Leia o cap\xEDtulo do in\xEDcio r\xE1pido do manual online para se iniciar com o WinMerge:
+ http://www.winmerge.org/2.8/manual/quickstart.html
+
+ Manual em HTML: O manual est\xE1 dispon\xEDvel online em
+http://www.winmerge.org/2.8/manual/ ele est\xE1 tamb\xE9m possivelmente instalado (se escolhido assim) localmente e descarreg\xE1vel separadamente de http://www.winmerge.org/ (veja a documenta\xE7\xE3o) Suporte para Arquivos: O
+WinMerge usa o 7-Zip para o suporte para arquivos dentro de arquivos. 7-Zip (http://www.7-zip.org) \xE9 uma ferramenta para arquivos com o c\xF3digo fonte aberto. Para instalar o suporte para arquivos dentro de arquivos, baixe o instalador do plugin do 7-Zip de http://www.winmerge.org/
+
+Instalando o suporte para arquivos: \xC9 recomendado instalar o aplicativo 7-Zip. Se isto n\xE3o pode ser feito por alguma raz\xE3o, o instalador do plugin do 7-Zip pode instalar apenas os arquivos necess\xE1rios para ativar o suporte para arquivos dentro dos arquivos. Note que N\xC3O permite o uso isolado do 7-Zip, apenas o suporte para arquivos para oWinMerge.
+
+ Suporte a Scripts:
+ Se voc\xEA gostaria de trabalhar com scripts Voc\xEA precisar\xE1 ter o Windows
+Scripting Host instalado. Se voc\xEA receber quaisquer erros relacionados aos seus
+scripts por favor visite
+http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
+ para ter certeza que seu Scripting Host est\xE1 ambos atualizado e n\xE3o corrompido.
+
+Suporte:
+ Os desenvolvedores est\xE3o respondendo as quest\xF5es nos f\xF3runs do WinMerge em Sourceforge.net:
+http://sourceforge.net/forum/?group_id=13216
+
+Bugs e pedidos para fun\xE7\xF5es:
+Bugs e sugest\xF5es para novas fun\xE7\xF5es devem ser submetidos nos trackers dos bugs e pedidos para fun\xE7\xF5es no sourceforge.net.
+
+Bug tracker:
+http://sourceforge.net/tracker/?group_id=13216&atid=113216 quando reportando um bug, por favor nos diga o n\xFAmero da vers\xE3o do WinMerge! As vers\xF5es do
+WinMerge2.2.0 e posterior podem emitir um 'Log da Configura\xE7\xE3o' no
+menu Ajuda/Configura\xE7\xE3o. Por favor anexe esta info (como anexo do arquivo) ao relat\xF3rio sobre o bug, ele tem muita informa\xE7\xE3o \xFAtil para os desenvolvedores.
+Tracker
+RFE (pedido para fun\xE7\xF5es):
+ http://sourceforge.net/tracker/?group_id=13216&atid=363216
+
+
+- Os Desenvolvedores do WinMerge
\ No newline at end of file
Property changes on: trunk/Docs/Users/Languages/ReadMe-Brazilian.txt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-06-05 13:46:11 UTC (rev 5429)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-06-05 16:21:35 UTC (rev 5430)
@@ -1,31 +1,16 @@
-; ***************************************************************
-; *** ***
-; *** Inno Setup version 5.1.11+ Portuguese (Brazil) messages ***
-; *** ***
-; *** Original Author: ***
-; *** ***
-; *** Paulo Andre Rosa (pa...@gm...) ***
-; *** ***
-; *** Contributors: ***
-; *** ***
-; *** Jeferson Oliveira (jef...@gm...) ***
-; *** ***
-; ***************************************************************
-
-; Default.isl version 1.69
-
+; *** Inno Setup version 5.1.11+ Brazilian Portuguese messages ***
+;
; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/is3rdparty.php
+; http://www.jrsoftware.org/files/istrans/
;
; Note: When translating this text, do not add periods (.) to the end of
; messages that didn't have them already, because on those messages Inno
; Setup adds the periods automatically (appending a period would result in
; two periods being displayed).
-;
-; $jrsoftware: issrc/Files/Languages/BrazilianPortuguese.isl,v 1.4 2007/03/15 16:31:10 mlaan Exp $
-;
[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
LanguageName=Portugu<00EA>s (Brasil)
LanguageID=$0416
LanguageCodePage=1252
@@ -44,53 +29,53 @@
[Messages]
; *** Application titles
-SetupAppTitle=Programa de Instala\xE7\xE3o
-SetupWindowTitle=%1 - Programa de Instala\xE7\xE3o
+SetupAppTitle=Instalador
+SetupWindowTitle=%1 - Instalador
UninstallAppTitle=Desinstalar
UninstallAppFullTitle=Desinstalar %1
; *** Misc. common
InformationTitle=Informa\xE7\xE3o
-ConfirmTitle=Confirma\xE7\xE3o
+ConfirmTitle=Confirmar
ErrorTitle=Erro
; *** SetupLdr messages
-SetupLdrStartupMessage=Este programa ir\xE1 instalar %1. Voc\xEA quer continuar?
-LdrCannotCreateTemp=N\xE3o foi poss\xEDvel criar um arquivo tempor\xE1rio. Instala\xE7\xE3o cancelada
-LdrCannotExecTemp=N\xE3o foi poss\xEDvel executar um arquivo na pasta de arquivos tempor\xE1rios. Instala\xE7\xE3o cancelada
+SetupLdrStartupMessage=Isto instalar\xE1 o %1. Voc\xEA deseja continuar?
+LdrCannotCreateTemp=Incapaz de criar um arquivo tempor\xE1rio. Instala\xE7\xE3o abortada
+LdrCannotExecTemp=Incapaz de executar o arquivo no diret\xF3rio tempor\xE1rio. Instala\xE7\xE3o abortada
; *** Startup error messages
LastErrorMessage=%1.%n%nErro %2: %3
-SetupFileMissing=O arquivo %1 n\xE3o se encontra na pasta de instala\xE7\xE3o. Por favor, corrija o problema ou obtenha uma nova c\xF3pia do programa.
+SetupFileMissing=Est\xE1 faltando o arquivo %1 do diret\xF3rio de instala\xE7\xE3o. Por favor, corrija o problema ou obtenha uma nova c\xF3pia do programa.
SetupFileCorrupt=Os arquivos de instala\xE7\xE3o est\xE3o corrompidos. Por favor, obtenha uma nova c\xF3pia do programa.
SetupFileCorruptOrWrongVer=Os arquivos de instala\xE7\xE3o est\xE3o corrompidos ou s\xE3o incompat\xEDveis com esta vers\xE3o do Instalador. Por favor, corrija o problema ou obtenha uma nova c\xF3pia do programa.
-NotOnThisPlatform=Este programa n\xE3o pode ser executado no %1.
+NotOnThisPlatform=Este programa n\xE3o executar\xE1 no %1.
OnlyOnThisPlatform=Este programa deve ser executado no %1.
-OnlyOnTheseArchitectures=Este programa s\xF3 pode ser instalado em vers\xF5es do Windows projetadas para as seguintes arquiteturas de processador:%n%n%1
-MissingWOW64APIs=A vers\xE3o de Windows que voc\xEA est\xE1 utilizando n\xE3o inclui funcionalidade requerida pelo Programa de Instala\xE7\xE3o para realizar uma instala\xE7\xE3o de 64 bits. Para corrigir este problema, por favor instale o Service Pack %1.
+OnlyOnTheseArchitectures=Este programa s\xF3 pode ser instalado em vers\xF5es do Windows projetadas para as seguintes arquiteturas de processadores:%n%n% 1
+MissingWOW64APIs=A vers\xE3o do Windows que voc\xEA est\xE1 executando n\xE3o inclui a funcionalidade requerida pelo Instalador para realizar uma instala\xE7\xE3o de 64 bits. Para corrigir este problema, por favor instale o Service Pack %1.
WinVersionTooLowError=Este programa requer %1 vers\xE3o %2 ou posterior.
-WinVersionTooHighError=Este programa n\xE3o pode ser instalado em %1 vers\xE3o %2 ou posterior.
-AdminPrivilegesRequired=Voc\xEA deve estar logado como administrador para instalar este programa.
-PowerUserPrivilegesRequired=Voc\xEA deve estar logado como administrador ou como membro do grupo Usu\xE1rios Avan\xE7ados para instalar este programa.
-SetupAppRunningError=O Programa de Instala\xE7\xE3o detectou que %1 est\xE1 sendo executado.%n%nPor favor, feche todas as inst\xE2ncias do programa em quest\xE3o e clique OK para continuar, ou Cancelar para sair.
-UninstallAppRunningError=O Programa de Desinstala\xE7\xE3o detectou que %1 est\xE1 sendo executado.%n%nPor favor, feche todas as inst\xE2ncias do programa em quest\xE3o e clique OK para continuar, ou Cancelar para sair.
+WinVersionTooHighError=Este programa n\xE3o pode ser instalado na %1 vers\xE3o %2 ou posterior.
+AdminPrivilegesRequired=Voc\xEA deve estar logado como um administrador quando instalar este programa.
+PowerUserPrivilegesRequired=Voc\xEA deve estar logado como um administrador ou como um membro do grupo de Usu\xE1rios Power quando instalar este programa.
+SetupAppRunningError=O Instalador detectou que o %1 est\xE1 executando atualmente.%n%nPor favor, feche todas as inst\xE2ncias dele agora, ent\xE3o clique em OK para continuar, ou em Cancelar para sair.
+UninstallAppRunningError=O Desinstalador detectou que o %1 est\xE1 executando atualmente.%n%nPor favor, feche todas as inst\xE2ncias dele agora, ent\xE3o clique em OK para continuar, ou em Cancelar para sair.
; *** Misc. errors
-ErrorCreatingDir=O Programa de Instala\xE7\xE3o n\xE3o pode criar a pasta "%1"
-ErrorTooManyFilesInDir=N\xE3o foi poss\xEDvel criar um arquivo na pasta "%1" porque ela j\xE1 cont\xE9m muitos arquivos
+ErrorCreatingDir=O Instalador foi incapaz de criar o diret\xF3rio "%1"
+ErrorTooManyFilesInDir=Incapaz de um arquivo no diret\xF3rio "%1" porque ele cont\xE9m arquivos demais
; *** Setup common messages
-ExitSetupTitle=Cancelar a Instala\xE7\xE3o
-ExitSetupMessage=A Instala\xE7\xE3o n\xE3o foi conclu\xEDda. Se voc\xEA cancelar agora, o programa n\xE3o ser\xE1 instalado.%n%nVoc\xEA pode concluir a instala\xE7\xE3o mais tarde, executando novamente o Programa de Instala\xE7\xE3o.%n%nCancelar a Instala\xE7\xE3o?
-AboutSetupMenuItem=&Sobre o Programa de Instala\xE7\xE3o...
-AboutSetupTitle=Sobre o Programa de Instala\xE7\xE3o
-AboutSetupMessage=%1 vers\xE3o %2%n%3%n%n%1 Internet:%n%4
+ExitSetupTitle=Sair do Instalador
+ExitSetupMessage=A Instala\xE7\xE3o n\xE3o est\xE1 completa. Se voc\xEA sair agora, o programa n\xE3o ser\xE1 instalado.%n%nVoc\xEA pode executar o instalador de novo outra hora para completar a instala\xE7\xE3o.%n%nSair do Instalador?
+AboutSetupMenuItem=&Sobre o Instalador...
+AboutSetupTitle=Sobre o Instalador
+AboutSetupMessage=%1 vers\xE3o %2%n%3%n%n%1 home page:%n%4
AboutSetupNote=
TranslatorNote=
; *** Buttons
ButtonBack=< &Voltar
-ButtonNext=&Avan\xE7ar >
+ButtonNext=&Pr\xF3ximo >
ButtonInstall=&Instalar
ButtonOK=OK
ButtonCancel=Cancelar
@@ -104,79 +89,79 @@
ButtonNewFolder=&Criar Nova Pasta
; *** "Select Language" dialog messages
-SelectLanguageTitle=Selecionar Idioma do Programa de Instala\xE7\xE3o
-SelectLanguageLabel=Selecione o idioma a ser utilizado durante a instala\xE7\xE3o:
+SelectLanguageTitle=Selecionar o Idioma do Instalador
+SelectLanguageLabel=Selecione o idioma para usar durante a instala\xE7\xE3o:
; *** Common wizard text
-ClickNext=Clique Avan\xE7ar para continuar, ou Cancelar para sair do Programa de Instala\xE7\xE3o.
+ClickNext=Clique em Pr\xF3ximo para continuar, ou em Cancelar para sair do Instalador.
BeveledLabel=
BrowseDialogTitle=Procurar Pasta
-BrowseDialogLabel=Selecione uma pasta na lista abaixo e clique OK.
+BrowseDialogLabel=Selecione uma pasta na lista abaixo, ent\xE3o clique em OK.
NewFolderName=Nova Pasta
; *** "Welcome" wizard page
-WelcomeLabel1=Bem-vindo ao Assistente de Instala\xE7\xE3o de [name]
-WelcomeLabel2=Este Assistente ir\xE1 instalar [name/ver] no seu computador.%n%nRecomenda-se fechar todos os outros programas antes de continuar.
+WelcomeLabel1=Bem-vindo ao Assistente do Instalador do [name]
+WelcomeLabel2=Isto instalar\xE1 o [name/ver] no seu computador.%n%n\xC9 recomendado que voc\xEA feche todos os outros aplicativos antes de continuar.
; *** "Password" wizard page
WizardPassword=Senha
PasswordLabel1=Esta instala\xE7\xE3o \xE9 protegida por senha.
-PasswordLabel3=Por favor, informe a senha e clique Avan\xE7ar para continuar. As senhas diferenciam mai\xFAsculas de min\xFAsculas.
+PasswordLabel3=Por favor, forne\xE7a a senha, ent\xE3o clique em Pr\xF3ximo para continuar. As senhas s\xE3o caso-sensitivo.
PasswordEditLabel=&Senha:
-IncorrectPassword=A senha que voc\xEA informou n\xE3o \xE9 correta. Por favor, tente novamente.
+IncorrectPassword=A senha que voc\xEA inseriu n\xE3o est\xE1 correta. Por favor, tente de novo.
; *** "License Agreement" wizard page
-WizardLicense=Contrato de Licen\xE7a de Uso
+WizardLicense=Acordo de Licen\xE7a
LicenseLabel=Por favor, leia as seguintes informa\xE7\xF5es importantes antes de continuar.
-LicenseLabel3=Por favor, leia o seguinte Contrato de Licen\xE7a de Uso. Voc\xEA deve aceitar os termos do Contrato antes de prosseguir com a instala\xE7\xE3o.
-LicenseAccepted=Eu &aceito os termos do Contrato
-LicenseNotAccepted=Eu &n\xE3o aceito os termos do Contrato
+LicenseLabel3=Por favor, leia o seguinte Acordo de Licen\xE7a. Voc\xEA deve aceitar os termos deste acordo antes de continuar com a instala\xE7\xE3o.
+LicenseAccepted=Eu &aceito o acordo
+LicenseNotAccepted=Eu &n\xE3o aceito o acordo
; *** "Information" wizard pages
WizardInfoBefore=Informa\xE7\xE3o
InfoBeforeLabel=Por favor, leia as seguintes informa\xE7\xF5es importantes antes de continuar.
-InfoBeforeClickLabel=Quando voc\xEA estiver pronto para continuar, clique Avan\xE7ar.
+InfoBeforeClickLabel=Quando voc\xEA estiver pronto para continuar com o Instalador, clique em Pr\xF3ximo.
WizardInfoAfter=Informa\xE7\xE3o
InfoAfterLabel=Por favor, leia as seguintes informa\xE7\xF5es importantes antes de continuar.
-InfoAfterClickLabel=Quando voc\xEA estiver pronto para continuar, clique Avan\xE7ar.
+InfoAfterClickLabel=Quando voc\xEA estiver pronto para continuar com o Instalador, clique em Pr\xF3ximo.
; *** "User Information" wizard page
-WizardUserInfo=Dados do Usu\xE1rio
-UserInfoDesc=Por favor, informe os seus dados.
+WizardUserInfo=Informa\xE7\xE3o do Usu\xE1rio
+UserInfoDesc=Por favor, insira suas informa\xE7\xF5es.
UserInfoName=&Nome do Usu\xE1rio:
-UserInfoOrg=&Empresa:
+UserInfoOrg=&Organiza\xE7\xE3o:
UserInfoSerial=&N\xFAmero de S\xE9rie:
-UserInfoNameRequired=Voc\xEA deve informar um nome.
+UserInfoNameRequired=Voc\xEA deve inserir um nome.
; *** "Select Destination Location" wizard page
-WizardSelectDir=Escolha a Pasta de destino
-SelectDirDesc=Onde [name] deve ser instalado?
-SelectDirLabel3=O Programa de Instala\xE7\xE3o ir\xE1 instalar [name] na seguinte pasta.
-SelectDirBrowseLabel=Para continuar, clique Avan\xE7ar. Se voc\xEA deseja escolher outra pasta, clique Procurar.
-DiskSpaceMBLabel=S\xE3o necess\xE1rios pelo menos [mb] MB de espa\xE7o livre em disco.
-ToUNCPathname=O Programa de Instala\xE7\xE3o n\xE3o pode fazer a instala\xE7\xE3o num caminho de rede UNC. Se voc\xEA estiver tentando instalar num local de rede, dever\xE1 mapear uma unidade de rede.
-InvalidPath=Voc\xEA deve informar um caminho completo, incluindo a letra da unidade de disco; por exemplo:%n%nC:\APP%n%e n\xE3o um caminho de rede UNC na forma:%n%n\\servidor\compartilhamento
-InvalidDrive=A unidade de disco ou local de rede UNC que voc\xEA escolheu n\xE3o existe ou est\xE1 inacess\xEDvel. Por favor, escolha outro local.
-DiskSpaceWarningTitle=Espa\xE7o em Disco Insuficiente
-DiskSpaceWarning=O Programa de Instala\xE7\xE3o requer pelo menos %1 KB de espa\xE7o livre, mas a unidade de disco selecionada tem apenas %2 KB dispon\xEDveis.%n%nVoc\xEA quer continuar assim mesmo?
+WizardSelectDir=Selecione o Local de Destino
+SelectDirDesc=Onde o [name] deve ser instalado?
+SelectDirLabel3=O Instalador instalar\xE1 o [name] na seguinte pasta.
+SelectDirBrowseLabel=Para continuar, clique em Pr\xF3ximo. Se voc\xEA gostaria de selecionar uma pasta diferente, clique em Procurar.
+DiskSpaceMBLabel=Pelo menos [mb] MB de espa\xE7o livre em disco \xE9 requerido.
+ToUNCPathname=O Instalador n\xE3o pode instalar em um nome de caminho UNC. Se voc\xEA est\xE1 tentando instalar por uma rede, voc\xEA precisar\xE1 mapear um drive de rede.
+InvalidPath=Voc\xEA deve inserir um caminho completo com a letra do drive; por exemplo:%n%nC:\APP%n%n\xE3o um caminho UNC na forma:%n%n\\servidor\compartilhamento
+InvalidDrive=O drive ou compartilhamento UNC que voc\xEA selecionou n\xE3o existe ou n\xE3o est\xE1 acess\xEDvel. Por favor, selecione outro.
+DiskSpaceWarningTitle=Sem Espa\xE7o em Disco o Suficiente
+DiskSpaceWarning=O Instalador requer pelo menos %1 KB de espa\xE7o livre para instalar, mas o drive selecionado apenas tem %2 KB dispon\xEDveis.%n%nVoc\xEA quer continuar de qualquer modo?
DirNameTooLong=O nome da pasta ou caminho \xE9 muito longo.
InvalidDirName=O nome da pasta n\xE3o \xE9 v\xE1lido.
-BadDirName32=O nome da pasta n\xE3o pode incluir os seguintes caracteres:%n%n%1
-DirExistsTitle=A Pasta J\xE1 Existe
-DirExists=A pasta:%n%n%1%n%nj\xE1 existe. Voc\xEA quer instalar nesta pasta assim mesmo?
+BadDirName32=Os nomes das pastas n\xE3o pode incluir quaisquer dos seguintes caracteres:%n%n%1
+DirExistsTitle=A Pasta Existe
+DirExists=A pasta:%n%n%1%n%nj\xE1 existe. Voc\xEA gostaria de instalar nesta pasta de qualquer maneira?
DirDoesntExistTitle=A Pasta N\xE3o Existe
-DirDoesntExist=A pasta:%n%n%1%n%nn\xE3o existe. Voc\xEA quer que esta pasta seja criada?
+DirDoesntExist=A pasta:%n%n%1%n%nn\xE3o existe. Voc\xEA gostaria quer a pasta fosse criada?
; *** "Select Components" wizard page
WizardSelectComponents=Selecionar Componentes
SelectComponentsDesc=Quais componentes devem ser instalados?
-SelectComponentsLabel2=Selecione os componentes que voc\xEA quer instalar; desmarque os componentes que voc\xEA n\xE3o quer instalar. Clique Avan\xE7ar quando estiver pronto para continuar.
+SelectComponentsLabel2=Selecione os componentes que voc\xEA quer instalar; desmarque os componentes que voc\xEA n\xE3o quer instalar. Clique em Pr\xF3ximo quando estiver pronto para continuar.
FullInstallation=Instala\xE7\xE3o completa
; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
CompactInstallation=Instala\xE7\xE3o compacta
CustomInstallation=Instala\xE7\xE3o personalizada
-NoUninstallWarningTitle=Componente J\xE1 Instalado
-NoUninstallWarning=O Programa de Instala\xE7\xE3o detectou que os seguintes componentes j\xE1 est\xE3o instalados em seu computador:%n%n%1%n%nSe voc\xEA desmarcar estes componentes, isto n\xE3o ir\xE1 fazer com que eles sejam desinstalados.%n%nVoc\xEA quer continuar assim mesmo?
+NoUninstallWarningTitle=O Componente Existe
+NoUninstallWarning=O Instalador detectou que os seguintes componentes j\xE1 est\xE3o instalados no seu computador:%n%n%1%n%nN\xE3o selecionar estes componentes n\xE3o desinstalar\xE1 eles.%n%nVoc\xEA gostaria de continuar de qualquer modo?
ComponentSize1=%1 KB
ComponentSize2=%1 MB
ComponentsDiskSpaceMBLabel=A sele\xE7\xE3o atual requer pelo menos [mb] MB de espa\xE7o em disco.
@@ -184,25 +169,25 @@
; *** "Select Additional Tasks" wizard page
WizardSelectTasks=Selecionar Tarefas Adicionais
SelectTasksDesc=Quais tarefas adicionais devem ser executadas?
-SelectTasksLabel2=Selecione as tarefas adicionais que voc\xEA deseja que o Programa de Instala\xE7\xE3o execute enquanto instala [name] e clique Avan\xE7ar.
+SelectTasksLabel2=Selecione as tarefas adicionais que voc\xEA gostaria que o Instalador executasse enquanto instala o [name], ent\xE3o clique em Pr\xF3ximo.
; *** "Select Start Menu Folder" wizard page
WizardSelectProgramGroup=Selecionar a Pasta do Menu Iniciar
-SelectStartMenuFolderDesc=Onde o Programa de Instala\xE7\xE3o deve instalar os atalhos do programa?
-SelectStartMenuFolderLabel3=O Programa de Instala\xE7\xE3o ir\xE1 criar os atalhos do programa na seguinte pasta do Menu Iniciar.
-SelectStartMenuFolderBrowseLabel=Clique Avan\xE7ar para continuar. Se voc\xEA quiser escolher outra pasta, clique Procurar.
-MustEnterGroupName=Voc\xEA deve informar o nome da pasta.
+SelectStartMenuFolderDesc=Onde o Instalador deve colocar os atalhos do programa?
+SelectStartMenuFolderLabel3=O Instalador criar\xE1 os atalhos do programa na seguinte pasta do Menu Iniciar.
+SelectStartMenuFolderBrowseLabel=Para continuar, clique em Pr\xF3ximo. Se voc\xEA gostaria de selecionar uma pasta diferente, clique em Procurar.
+MustEnterGroupName=Voc\xEA deve inserir um nome de pasta.
GroupNameTooLong=O nome da pasta ou caminho \xE9 muito longo.
InvalidGroupName=O nome da pasta n\xE3o \xE9 v\xE1lido.
-BadGroupName=O nome da pasta n\xE3o pode incluir os seguintes caracteres:%n%n%1
+BadGroupName=O nome da pasta n\xE3o pode incluir quaisquer dos seguintes caracteres:%n%n%1
NoProgramGroupCheck2=&N\xE3o criar uma pasta no Menu Iniciar
; *** "Ready to Install" wizard page
WizardReady=Pronto para Instalar
-ReadyLabel1=O Programa de Instala\xE7\xE3o est\xE1 pronto para come\xE7ar a instala\xE7\xE3o de [name] no seu computador.
-ReadyLabel2a=Clique Instalar para iniciar a instala\xE7\xE3o, ou clique Voltar para revisar ou alterar alguma configura\xE7\xE3o.
-ReadyLabel2b=Clique Instalar para iniciar a instala\xE7\xE3o.
-ReadyMemoUserInfo=Dados do Usu\xE1rio:
+ReadyLabel1=O Instalador est\xE1 agora pronto para come\xE7ar a instalar o [name] no seu computador.
+ReadyLabel2a=Clique em Instalar para continuar com a instala\xE7\xE3o, ou clique em Voltar se voc\xEA quer revisar ou mudar quaisquer configura\xE7\xF5es.
+ReadyLabel2b=Clique em Instalar para continuar com a instala\xE7\xE3o.
+ReadyMemoUserInfo=Informa\xE7\xE3o do usu\xE1rio:
ReadyMemoDir=Local de destino:
ReadyMemoType=Tipo de Instala\xE7\xE3o:
ReadyMemoComponents=Componentes selecionados:
@@ -211,113 +196,111 @@
; *** "Preparing to Install" wizard page
WizardPreparing=Preparando para Instalar
-PreparingDesc=O Programa de Instala\xE7\xE3o est\xE1 se preparando para instalar [name] no seu computador.
-PreviousInstallNotCompleted=A instala\xE7\xE3o/desinstala\xE7\xE3o de um programa anterior n\xE3o foi conclu\xEDda. Voc\xEA deve reiniciar o computador para finaliz\xE1-la.%n%nAp\xF3s reiniciar o computador, execute novamente o Programa de Instala\xE7\xE3o para concluir a instala\xE7\xE3o de [name].
-CannotContinue=O Programa de Instala\xE7\xE3o n\xE3o pode continuar. Por favor, clique Cancelar para sair.
+PreparingDesc=O Instalador est\xE1 se preparando para instalar o [name] no seu computador.
+PreviousInstallNotCompleted=A instala\xE7\xE3o/remo\xE7\xE3o de um programa anterior n\xE3o foi completada. Voc\xEA precisar\xE1 reiniciar o computador para completar essa instala\xE7\xE3o.%n%nAp\xF3s reiniciar seu computador, execute o Instalador de novo para completar a instala\xE7\xE3o do [name].
+CannotContinue=O Instalador n\xE3o pode continuar. Por favor, clique em Cancelar para sair.
; *** "Installing" wizard page
WizardInstalling=Instalando
-InstallingLabel=Por favor, aguarde enquanto o Programa de Instala\xE7\xE3o instala [name] no seu computador.
+InstallingLabel=Por favor, aguarde enquanto o Instalador instala o [name] no seu computador.
; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Finalizando o Assistente de Instala\xE7\xE3o de [name]
-FinishedLabelNoIcons=O Programa de Instala\xE7\xE3o finalizou a instala\xE7\xE3o de [name] no seu computador.
-FinishedLabel=O Programa de Instala\xE7\xE3o finalizou a instala\xE7\xE3o de [name] no seu computador. O programa pode ser iniciado clicando nos \xEDcones instalados.
-ClickFinish=Clique Concluir para sair do Programa de Instala\xE7\xE3o.
-FinishedRestartLabel=Para concluir a instala\xE7\xE3o de [name], o Programa de Instala\xE7\xE3o deve reiniciar o computador. Voc\xEA quer que o computador seja reiniciado agora?
-FinishedRestartMessage=Para concluir a instala\xE7\xE3o de [name], o Programa de Instala\xE7\xE3o deve reiniciar o computador.%n%nVoc\xEA quer que o computador seja reiniciado agora?
+FinishedHeadingLabel=Completando o Assistente do Instalador do [name]
+FinishedLabelNoIcons=O Instalador terminou de instalar o [name] no seu computador.
+FinishedLabel=O Instalador terminou de instalar o [name] no seu computador. O aplicativo pode ser iniciado selecionando os \xEDcones instalados.
+ClickFinish=Clique em Concluir para sair do Instalador.
+FinishedRestartLabel=Para completar a instala\xE7\xE3o do [name], o Instalador deve reiniciar seu computador. Voc\xEA gostaria de reiniciar agora?
+FinishedRestartMessage=Para completar a instala\xE7\xE3o do [name], o Instalador deve reiniciar seu computador.%n%nVoc\xEA gostaria de reiniciar agora?
ShowReadmeCheck=Sim, eu quero visualizar o arquivo LEIA-ME
YesRadio=&Sim, reiniciar o computador agora
-NoRadio=&N\xE3o, eu vou reiniciar o computador depois
+NoRadio=&N\xE3o, eu reiniciarei o computador depois
; used for example as 'Run MyProg.exe'
RunEntryExec=Executar %1
; used for example as 'View Readme.txt'
RunEntryShellExec=Visualizar %1
; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=O Programa de Instala\xE7\xE3o Precisa do Pr\xF3ximo Disco
-SelectDiskLabel2=Por favor, insira o Disco %1 e clique OK.%n%nSe os arquivos deste disco est\xE3o numa pasta diferente da indicada abaixo, informe o caminho correto ou clique Procurar.
+ChangeDiskTitle=O Instalador Precisa do Pr\xF3ximo Disco
+SelectDiskLabel2=Por favor, insira o Disco %1 e clique em OK.%n%nSe os arquivos neste disco podem ser achados numa pasta diferente do que a exibida abaixo, insira o caminho correto ou clique em Procurar.
PathLabel=&Caminho:
-FileNotInDir2=O arquivo "%1" n\xE3o pode ser encontrado em "%2". Por favor, insira o disco correto ou escolha outra pasta.
-SelectDirectoryLabel=Por favor, informe o local do pr\xF3ximo disco.
+FileNotInDir2=O arquivo "%1" n\xE3o p\xF4de ser localizado em "%2". Por favor, insira o disco correto ou escolha outra pasta.
+SelectDirectoryLabel=Por favor, especifique o local do pr\xF3ximo disco.
; *** Installation phase messages
-SetupAborted=A instala\xE7\xE3o n\xE3o foi conclu\xEDda.%n%nPor favor, corrija o problema e execute novamente o Programa de Instala\xE7\xE3o.
-EntryAbortRetryIgnore=Clique Repetir para tentar novamente, Ignorar para continuar assim mesmo, or Cancelar para cancelar a instala\xE7\xE3o.
+SetupAborted=A instala\xE7\xE3o n\xE3o foi completada.%n%nPor favor, corrija o problema e execute o Instalador de novo.
+EntryAbortRetryIgnore=Clique em Repetir para tentar de novo, Ignorar para prosseguir de qualquer maneira, ou em Abortar para cancelar a instala\xE7\xE3o.
; *** Installation status messages
-StatusCreateDirs=Criando pastas...
+StatusCreateDirs=Criando diret\xF3rios...
StatusExtractFiles=Extraindo arquivos...
StatusCreateIcons=Criando atalhos...
StatusCreateIniEntries=Criando entradas INI...
StatusCreateRegistryEntries=Criando entradas no Registro...
StatusRegisterFiles=Registrando arquivos...
StatusSavingUninstall=Salvando informa\xE7\xF5es de desinstala\xE7\xE3o...
-StatusRunProgram=Finalizando a instala\xE7\xE3o...
-StatusRollback=Desfazendo as altera\xE7\xF5es efetuadas...
+StatusRunProgram=Concluindo a instala\xE7\xE3o...
+StatusRollback=Desfazendo as mudan\xE7as...
; *** Misc. errors
ErrorInternal2=Erro interno: %1
ErrorFunctionFailedNoCode=%1 falhou
ErrorFunctionFailed=%1 falhou; c\xF3digo %2
ErrorFunctionFailedWithMessage=%1 falhou; c\xF3digo %2.%n%3
-ErrorExecutingProgram=N\xE3o foi poss\xEDvel executar o arquivo:%n%1
+ErrorExecutingProgram=Incapaz de executar o arquivo:%n%1
; *** Registry errors
-ErrorRegOpenKey=Erro ao abrir a chave do Registro:%n%1\%2
-ErrorRegCreateKey=Erro ao criar a chave do Registro:%n%1\%2
-ErrorRegWriteKey=Erro ao escrever na chave do Registro:%n%1\%2
+ErrorRegOpenKey=Erro ao abrir a chave do registro:%n%1\%2
+ErrorRegCreateKey=Erro ao criar a chave do registro:%n%1\%2
+ErrorRegWriteKey=Erro ao escrever na chave do registro:%n%1\%2
; *** INI errors
ErrorIniEntry=Erro ao criar entrada INI no arquivo "%1".
; *** File copying errors
-FileAbortRetryIgnore=Clique Repetir para tentar novamente, Ignorar para ignorar este arquivo (n\xE3o recomendado) ou Cancelar para cancelar a instala\xE7\xE3o.
-FileAbortRetryIgnore2=Click Repetir para tentar novamente, Ignorar para prosseguir assim mesmo (n\xE3o recomendado), ou Cancelar para cancelar a instala\xE7\xE3o.
+FileAbortRetryIgnore=Clique em Repetir para tentar de novo, Ignorar para pular este arquivo (n\xE3o recomendado) ou em Abortar para cancelar a instala\xE7\xE3o.
+FileAbortRetryIgnore2=Clique em Repetir para tentar de novo, ...
[truncated message content] |
|
From: <ki...@us...> - 2008-06-07 06:29:23
|
Revision: 5443
http://winmerge.svn.sourceforge.net/winmerge/?rev=5443&view=rev
Author: kimmov
Date: 2008-06-06 23:29:21 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
PATCH: [ 1984346 ] Archive reports don't include original archive paths/names
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/DirDoc.cpp
trunk/Src/DirDoc.h
trunk/Src/DirView.cpp
trunk/Src/MergeDoc.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-06 05:20:49 UTC (rev 5442)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-07 06:29:21 UTC (rev 5443)
@@ -2,6 +2,9 @@
Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
to Subversion revision numbers (rXXXXX).
+WinMerge 2.9.1.4
+ BugFix: Temp paths in Reports created from archive file (#1984346)
+
WinMerge 2.9.1.3 - 2008-06-05 (r5438)
Update PCRE (regular expression library) to version 7.7 (#1941779)
Add VB.net keywords to Basic highlighter (#1970912)
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2008-06-06 05:20:49 UTC (rev 5442)
+++ trunk/Src/DirDoc.cpp 2008-06-07 06:29:21 UTC (rev 5443)
@@ -212,7 +212,7 @@
const String & right = GetRightBasePath();
// If we have temp context it means we are comparing archives
- if (m_pTempPathContext)
+ if (IsArchiveFolders())
{
LPCTSTR lname = PathFindFileName(left.c_str());
LPCTSTR rname = PathFindFileName(right.c_str());
@@ -877,7 +877,12 @@
}
/**
- * @brief Replace internal root by display root (left)
+ * @brief Replace internal root by display root (left).
+ * When we have a archive file open, this function converts physical folder
+ * (that is in the temp folder where archive was extracted) to the virtual
+ * path for showing. The virtual path is path to the archive file, archive
+ * file name and folder inside the archive.
+ * @param [in, out] sText Path to convert.
*/
void CDirDoc::ApplyLeftDisplayRoot(String &sText)
{
@@ -889,7 +894,12 @@
}
/**
- * @brief Replace internal root by display root (right)
+ * @brief Replace internal root by display root (right).
+ * When we have a archive file open, this function converts physical folder
+ * (that is in the temp folder where archive was extracted) to the virtual
+ * path for showing. The virtual path is path to the archive file, archive
+ * file name and folder inside the archive.
+ * @param [in, out] sText Path to convert.
*/
void CDirDoc::ApplyRightDisplayRoot(String &sText)
{
@@ -1061,3 +1071,15 @@
m_pCtxt->GetNextDiffPosition(pos);
}
}
+
+/**
+ * @brief Checks if current folders are opened from archive file.
+ * @return true if we are inside archive, false otherwise.
+ */
+bool CDirDoc::IsArchiveFolders()
+{
+ if (m_pTempPathContext)
+ return true;
+ else
+ return false;
+}
Modified: trunk/Src/DirDoc.h
===================================================================
--- trunk/Src/DirDoc.h 2008-06-06 05:20:49 UTC (rev 5442)
+++ trunk/Src/DirDoc.h 2008-06-07 06:29:21 UTC (rev 5443)
@@ -146,6 +146,7 @@
void SetItemViewFlag(POSITION key, UINT flag, UINT mask);
void SetItemViewFlag(UINT flag, UINT mask);
const CompareStats * GetCompareStats() const { return m_pCompareStats; };
+ bool IsArchiveFolders();
protected:
void LoadLineFilterList();
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2008-06-06 05:20:49 UTC (rev 5442)
+++ trunk/Src/DirView.cpp 2008-06-07 06:29:21 UTC (rev 5443)
@@ -2487,7 +2487,18 @@
DirCmpReport report(colKeys);
report.SetList(m_pList);
- PathContext paths(pDoc->GetLeftBasePath().c_str(), pDoc->GetRightBasePath().c_str());
+
+ String left = pDoc->GetLeftBasePath().c_str();
+ String right = pDoc->GetRightBasePath().c_str();
+
+ // If inside archive, convert paths
+ if (pDoc->IsArchiveFolders())
+ {
+ pDoc->ApplyLeftDisplayRoot(left);
+ pDoc->ApplyRightDisplayRoot(right);
+ }
+
+ PathContext paths(left.c_str(), right.c_str());
report.SetRootPaths(paths);
report.SetColumns(m_dispcols);
String errStr;
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-06-06 05:20:49 UTC (rev 5442)
+++ trunk/Src/MergeDoc.cpp 2008-06-07 06:29:21 UTC (rev 5443)
@@ -3355,6 +3355,24 @@
_T("<tr>\n")
, nFontSize, m_pView[0]->GetHTMLStyles()));
+ // Get paths
+ // If archive, use archive path + folder + filename inside archive
+ // If desc text given, use it
+ String left = m_filePaths.GetPath(0);
+ String right = m_filePaths.GetPath(1);
+ if (m_pDirDoc->IsArchiveFolders())
+ {
+ m_pDirDoc->ApplyLeftDisplayRoot(left);
+ m_pDirDoc->ApplyRightDisplayRoot(right);
+ }
+ else
+ {
+ if (!m_strDesc[0].empty())
+ left = m_strDesc[0];
+ if (!m_strDesc[1].empty())
+ right = m_strDesc[0];
+ }
+
// left and right title
int nBuffer;
for (nBuffer = 0; nBuffer < 2; nBuffer++)
@@ -3364,10 +3382,10 @@
nLineNumberColumnWidth));
file.WriteString(Fmt(_T("<th class=\"title\" style=\"width:%f%%\">"),
(double)(100 - nLineNumberColumnWidth * 2) / 2));
- if (!m_strDesc[nBuffer].empty())
- file.WriteString(m_strDesc[nBuffer].c_str());
+ if (nBuffer == 0)
+ file.WriteString(left.c_str());
else
- file.WriteString(m_filePaths.GetPath(nBuffer).c_str());
+ file.WriteString(right.c_str());
file.WriteString(_T("</th>\n"));
}
file.WriteString(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-06-09 19:53:49
|
Revision: 5449
http://winmerge.svn.sourceforge.net/winmerge/?rev=5449&view=rev
Author: gerundt
Date: 2008-06-09 12:53:28 -0700 (Mon, 09 Jun 2008)
Log Message:
-----------
PATCH: [ 1981326 ] ISL file syntax highlighting starts comment with {
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-09 15:32:15 UTC (rev 5448)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-09 19:53:28 UTC (rev 5449)
@@ -4,6 +4,7 @@
WinMerge 2.9.1.4
BugFix: Temp paths in Reports created from archive file (#1984346)
+ BugFix: ISL file syntax highlighting starts comment with { (#1981326)
WinMerge 2.9.1.3 - 2008-06-05 (r5438)
Update PCRE (regular expression library) to version 7.7 (#1941779)
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2008-06-09 15:32:15 UTC (rev 5448)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2008-06-09 19:53:28 UTC (rev 5449)
@@ -278,8 +278,8 @@
CCrystalTextView::SRC_DCL, _T ("DCL"), _T ("dcl,dcc"), &CCrystalTextView::ParseLineDcl, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_FORTRAN, _T ("Fortran"), _T ("f,f90,f9p,fpp,for,f77"), &CCrystalTextView::ParseLineFortran, SRCOPT_INSERTTABS|SRCOPT_AUTOINDENT, /*8,*/ _T (""), _T (""), _T ("!"), (DWORD)-1,
CCrystalTextView::SRC_HTML, _T ("HTML"), _T ("html,htm,shtml,ihtml,ssi,stm,stml,jsp"), &CCrystalTextView::ParseLineHtml, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("<!--"), _T ("-->"), _T (""), (DWORD)-1,
- CCrystalTextView::SRC_INI, _T ("INI"), _T ("ini,reg,vbp"), &CCrystalTextView::ParseLineIni, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU|SRCOPT_EOLNUNIX, /*2,*/ _T (""), _T (""), _T (";"), (DWORD)-1,
- CCrystalTextView::SRC_INNOSETUP, _T ("InnoSetup"), _T ("iss,isl"), &CCrystalTextView::ParseLineInnoSetup, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("{"), _T ("}"), _T (";"), (DWORD)-1,
+ CCrystalTextView::SRC_INI, _T ("INI"), _T ("ini,reg,vbp,isl"), &CCrystalTextView::ParseLineIni, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU|SRCOPT_EOLNUNIX, /*2,*/ _T (""), _T (""), _T (";"), (DWORD)-1,
+ CCrystalTextView::SRC_INNOSETUP, _T ("InnoSetup"), _T ("iss"), &CCrystalTextView::ParseLineInnoSetup, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("{"), _T ("}"), _T (";"), (DWORD)-1,
CCrystalTextView::SRC_INSTALLSHIELD, _T ("InstallShield"), _T ("rul"), &CCrystalTextView::ParseLineIS, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_JAVA, _T ("Java"), _T ("java,jav,js"), &CCrystalTextView::ParseLineJava, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_LISP, _T ("AutoLISP"), _T ("lsp,dsl"), &CCrystalTextView::ParseLineLisp, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (";|"), _T ("|;"), _T (";"), (DWORD)-1,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-06-15 13:56:49
|
Revision: 5480
http://winmerge.svn.sourceforge.net/winmerge/?rev=5480&view=rev
Author: sdottaka
Date: 2008-06-15 06:29:27 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
BUG: [ 1993835 ] Crash when starting a second instance
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-12 18:15:14 UTC (rev 5479)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-15 13:29:27 UTC (rev 5480)
@@ -7,6 +7,7 @@
Manual: Use PNG files (#1988845, #1989744)
BugFix: Temp paths in Reports created from archive file (#1984346)
BugFix: ISL file syntax highlighting starts comment with { (#1981326)
+ BugFix: Crash when starting a second instance (#1993835)
WinMerge 2.9.1.3 - 2008-06-05 (r5438)
Update PCRE (regular expression library) to version 7.7 (#1941779)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-06-12 18:15:14 UTC (rev 5479)
+++ trunk/Src/MainFrm.cpp 2008-06-15 13:29:27 UTC (rev 5480)
@@ -2737,7 +2737,7 @@
theApp.ParseArgsAndDoOpen(cmdInfo, this);
// Delete memrory allocated in OnCopyData method.
- for (int i = 0; i < argc; ++i)
+ for (int i = 0; i < __argc; ++i)
{
delete[] __targv[i];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-06-15 21:59:36
|
Revision: 5482
http://winmerge.svn.sourceforge.net/winmerge/?rev=5482&view=rev
Author: sdottaka
Date: 2008-06-15 14:59:35 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
BUG: [1994402] Crash when starting WinMerge with only one path
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/WinMergeCmdLineParser.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-15 13:30:32 UTC (rev 5481)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-15 21:59:35 UTC (rev 5482)
@@ -8,6 +8,7 @@
BugFix: Temp paths in Reports created from archive file (#1984346)
BugFix: ISL file syntax highlighting starts comment with { (#1981326)
BugFix: Crash when starting a second instance (#1993835)
+ BugFix: Crash when starting WinMerge with only one path (#1994402)
WinMerge 2.9.1.3 - 2008-06-05 (r5438)
Update PCRE (regular expression library) to version 7.7 (#1941779)
Modified: trunk/Src/WinMergeCmdLineParser.cpp
===================================================================
--- trunk/Src/WinMergeCmdLineParser.cpp 2008-06-15 13:30:32 UTC (rev 5481)
+++ trunk/Src/WinMergeCmdLineParser.cpp 2008-06-15 21:59:35 UTC (rev 5482)
@@ -252,16 +252,13 @@
{
file1 = m_cmdLineInfo.m_Files[0].Left(pos);
file2 = m_cmdLineInfo.m_Files[0].Mid(pos + 2);
- }
- // Remove possible parenthesis from end of second path.
- // Second path got split from first path.
- if (file2[file2.GetLength() - 1] == '\"')
- file2.Delete(file2.GetLength() - 1, 1);
+ // Remove possible quotation mark from end of second path.
+ // Second path got split from first path.
+ if (file2[file2.GetLength() - 1] == '\"')
+ file2.Delete(file2.GetLength() - 1, 1);
- // Set new paths to the structure
- if (pos > 0)
- {
+ // Set new paths to the structure
m_cmdLineInfo.m_Files[0] = file1;
m_cmdLineInfo.m_Files.SetAtGrow(1, file2);
m_cmdLineInfo.m_nFiles = 2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-16 04:52:24
|
Revision: 5484
http://winmerge.svn.sourceforge.net/winmerge/?rev=5484&view=rev
Author: kimmov
Date: 2008-06-15 21:52:20 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
PATCH: [ 1991259 ] Convert editor find/replace to use PCRE regexps
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Merge.vcproj
trunk/Src/editlib/ccrystaleditview.cpp
trunk/Src/editlib/ccrystaltextview.cpp
trunk/Src/editlib/ccrystaltextview.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-15 22:01:08 UTC (rev 5483)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-16 04:52:20 UTC (rev 5484)
@@ -3,6 +3,7 @@
to Subversion revision numbers (rXXXXX).
WinMerge 2.9.1.4
+ Use PCRE regular expressions in the editor (#1991259)
Update release notes (#1990886)
Manual: Use PNG files (#1988845, #1989744)
BugFix: Temp paths in Reports created from archive file (#1984346)
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-06-15 22:01:08 UTC (rev 5483)
+++ trunk/Src/Merge.vcproj 2008-06-16 04:52:20 UTC (rev 5484)
@@ -6854,46 +6854,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="editlib\cregexp.cpp">
- <FileConfiguration
- Name="UnicodeRelease|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="editlib\cregexp.h">
- </File>
- <File
RelativePath="editlib\crystaleditviewex.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
Modified: trunk/Src/editlib/ccrystaleditview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaleditview.cpp 2008-06-15 22:01:08 UTC (rev 5483)
+++ trunk/Src/editlib/ccrystaleditview.cpp 2008-06-16 04:52:20 UTC (rev 5484)
@@ -58,6 +58,15 @@
// (see OnChar())
////////////////////////////////////////////////////////////////////////////
+/**
+ * @file ccrystaleditview.cpp
+ *
+ * @brief Implementation of the CCrystalEditView class
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+
#include "stdafx.h"
#include "editcmd.h"
#include "editreg.h"
@@ -1331,9 +1340,7 @@
}
// Execute Replace dialog
- // m_bShowInactiveSelection = TRUE; // FP: removed because I like it
dlg.DoModal ();
- // m_bShowInactiveSelection = FALSE; // FP: removed because I like it
// actually this value doesn't change during doModal, but it may in the future
lastSearch = dlg.GetLastSearchInfos();
@@ -1362,10 +1369,17 @@
// Save search parameters to registry
VERIFY (RegSaveNumber (HKEY_CURRENT_USER, REG_EDITPAD, _T ("ReplaceFlags"), m_dwLastReplaceFlags));
- // pApp->WriteProfileString (REG_REPLACE_SUBKEY, REG_FIND_WHAT, lastSearch->m_sText);
- // pApp->WriteProfileString (REG_REPLACE_SUBKEY, REG_REPLACE_WITH, lastSearch->m_sNewText);
}
+/**
+ * @brief Replace selected text.
+ * This function replaces selected text in the editor pane with given text.
+ * @param [in] pszNewText The text replacing selected text.
+ * @param [in] cchNewText Length of the replacing text.
+ * @param [in] dwFlags Additional modifier flags:
+ * - FIND_REGEXP: use the regular expression.
+ * @return TRUE if succeeded.
+ */
BOOL CCrystalEditView::
ReplaceSelection (LPCTSTR pszNewText, int cchNewText, DWORD dwFlags)
{
@@ -1382,10 +1396,6 @@
GetSelection (ptSelStart, ptSelEnd);
ptCursorPos = ptSelStart;
- /*SetAnchor (ptCursorPos);
- SetSelection (ptCursorPos, ptCursorPos);
- SetCursorPos (ptCursorPos);
- EnsureVisible (ptCursorPos);*/
m_pTextBuffer->DeleteText (this, ptSelStart.y, ptSelStart.x, ptSelEnd.y, ptSelEnd.x, CE_ACTION_REPLACE);
}
@@ -1395,30 +1405,8 @@
int x = 0;
int y = 0;
- if (dwFlags & FIND_REGEXP)
- {
- LPTSTR lpszNewStr;
- if (m_pszMatched && !RxReplace(pszNewText, m_pszMatched, m_nLastFindWhatLen, m_rxmatch, &lpszNewStr, &m_nLastReplaceLen))
- {
- CString text;
- if (lpszNewStr && m_nLastReplaceLen > 0)
- {
- LPTSTR buf = text.GetBuffer (m_nLastReplaceLen + 1);
- _tcsncpy (buf, lpszNewStr, m_nLastReplaceLen);
- text.ReleaseBuffer (m_nLastReplaceLen);
- }
- else
- text.Empty ();
- m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, text, text.GetLength(), y, x, CE_ACTION_REPLACE); // [JRT+FRD]
- if (lpszNewStr)
- free(lpszNewStr);
- }
- }
- else
- {
- m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszNewText, cchNewText, y, x, CE_ACTION_REPLACE); // [JRT]
- m_nLastReplaceLen = cchNewText;
- }
+ m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszNewText, cchNewText, y, x, CE_ACTION_REPLACE); // [JRT]
+ m_nLastReplaceLen = cchNewText;
CPoint ptEndOfBlock = CPoint (x, y);
ASSERT_VALIDTEXTPOS (ptCursorPos);
@@ -1426,7 +1414,6 @@
SetAnchor (ptEndOfBlock);
SetSelection (ptCursorPos, ptEndOfBlock);
SetCursorPos (ptEndOfBlock);
- //EnsureVisible (ptEndOfBlock);
m_pTextBuffer->FlushUndoGroup(this);
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2008-06-15 22:01:08 UTC (rev 5483)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2008-06-16 04:52:20 UTC (rev 5484)
@@ -103,6 +103,8 @@
#include "gotodlg.h"
#include "ViewableWhitespace.h"
#include "SyntaxColors.h"
+#include "Ucs2Utf8.h"
+#include "pcre.h"
// Escaped character constants in range 0x80-0xFF are interpreted in current codepage
// Using C locale gets us direct mapping to Unicode codepoints
@@ -497,7 +499,6 @@
, m_nMaxLineLength(-1)
{
AFX_ZERO_INIT_OBJECT (CView);
- m_rxnode = NULL;
m_pszMatched = NULL;
m_bSelMargin = TRUE;
m_bViewLineNumbers = FALSE;
@@ -541,11 +542,6 @@
free (m_pszLastFindWhat);
m_pszLastFindWhat=NULL;
}
- if (m_rxnode)
- {
- RxFree (m_rxnode);
- m_rxnode = NULL;
- }
if (m_pszMatched)
{
free(m_pszMatched); // Allocated by _tcsdup()
@@ -4592,24 +4588,69 @@
}
static int
-FindStringHelper (LPCTSTR pszFindWhere, LPCTSTR pszFindWhat, DWORD dwFlags, int &nLen, RxNode *&rxnode, RxMatchRes *rxmatch)
+FindStringHelper (LPCTSTR pszFindWhere, LPCTSTR pszFindWhat, DWORD dwFlags,
+ int &nLen)
{
if (dwFlags & FIND_REGEXP)
{
int pos;
+ const char * errormsg = NULL;
+ int erroroffset = 0;
+ char regexString[200] = {0};
+ int regexLen = 0;
+ int pcre_opts = 0;
- if (rxnode)
- RxFree (rxnode);
- rxnode = RxCompile (pszFindWhat);
- if (rxnode && RxExec (rxnode, pszFindWhere, _tcslen (pszFindWhere), pszFindWhere, rxmatch, (dwFlags & FIND_MATCH_CASE) != 0 ? RX_CASE : 0))
+#ifdef UNICODE
+ // For unicode builds, use UTF-8.
+ // Convert pattern to UTF-8 and set option for PCRE to specify UTF-8.
+ regexLen = TransformUcs2ToUtf8(pszFindWhat, _tcslen(pszFindWhat),
+ regexString, sizeof(regexString));
+ pcre_opts |= PCRE_UTF8;
+#else
+ strcpy(regexString, pszFindWhat);
+ regexLen = strlen(regexString);
+#endif
+ pcre_opts |= PCRE_BSR_ANYCRLF;
+ if ((dwFlags & FIND_MATCH_CASE) == 0)
+ pcre_opts |= PCRE_CASELESS;
+
+ pcre *regexp = pcre_compile(regexString, pcre_opts, &errormsg,
+ &erroroffset, NULL);
+ pcre_extra *pe = NULL;
+ if (regexp)
{
- pos = rxmatch->Open[0];
- nLen = rxmatch->Close[0] - rxmatch->Open[0];
+ errormsg = NULL;
+ pe = pcre_study(regexp, 0, &errormsg);
}
- else
+
+ int ovector[30];
+ char compString[200] = {0};
+ int stringLen = 0;
+ TCHAR * tempName = _tcsdup(pszFindWhere); // Create temp copy for conversions
+ TCHAR * cmpStr = _tcsupr(tempName);
+
+#ifdef UNICODE
+ stringLen = TransformUcs2ToUtf8(cmpStr, _tcslen(cmpStr),
+ compString, sizeof(compString));
+#else
+ strcpy(compString, cmpStr);
+ stringLen = strlen(compString);
+#endif
+
+ int result = pcre_exec(regexp, pe, compString, stringLen,
+ 0, 0, ovector, 30);
+ free(tempName);
+
+ if (result >= 0)
{
- pos = -1;
+ pos = ovector[0];
+ nLen = ovector[1] - ovector[0];
}
+ else
+ pos = -1;
+
+ pcre_free(regexp);
+ pcre_free(pe);
return pos;
}
else
@@ -4806,7 +4847,6 @@
else
{
nLineLength = GetLineLength(ptCurrentPos.y);
- //BEGIN SW+FP
if (ptCurrentPos.x == -1)
{
ptCurrentPos.x = nLineLength;
@@ -4814,43 +4854,21 @@
else
if( ptCurrentPos.x >= nLineLength )
ptCurrentPos.x = nLineLength - 1;
- /*ORIGINAL
- if (ptCurrentPos.x == -1)
- {
- nLineLength = GetLineLength (ptCurrentPos.y);
- ptCurrentPos.x = nLineLength;
- }
- else
- nLineLength = ptCurrentPos.x;
- if (nLineLength <= 0)
- {
- ptCurrentPos.x = -1;
- ptCurrentPos.y--;
- continue;
- }
- *///END SW
LPCTSTR pszChars = GetLineChars (ptCurrentPos.y);
- //BEGIN SW
_tcsncpy(line.GetBuffer(ptCurrentPos.x + 2), pszChars, ptCurrentPos.x + 1);
- /*ORIGINAL
- LPTSTR pszBuf = line.GetBuffer (nLineLength + 1);
- _tcsncpy (pszBuf, pszChars, nLineLength);
- pszBuf[nLineLength] = _T ('\0');
- *///END SW
line.ReleaseBuffer (ptCurrentPos.x + 1);
if ((dwFlags & FIND_MATCH_CASE) == 0)
line.MakeUpper ();
}
- //BEGIN SW
- int nFoundPos = -1;
- int nMatchLen = what.GetLength();
- int nLineLen = line.GetLength();
- int nPos;
+ int nFoundPos = -1;
+ int nMatchLen = what.GetLength();
+ int nLineLen = line.GetLength();
+ int nPos;
do
{
- nPos = ::FindStringHelper(line, what, dwFlags, m_nLastFindWhatLen, m_rxnode, &m_rxmatch);
+ nPos = ::FindStringHelper(line, what, dwFlags, m_nLastFindWhatLen);
if( nPos >= 0 )
{
nFoundPos = (nFoundPos == -1)? nPos : nFoundPos + nPos;
@@ -4871,42 +4889,6 @@
ptCurrentPos.y--;
if( ptCurrentPos.y >= 0 )
ptCurrentPos.x = GetLineLength( ptCurrentPos.y );
- /*ORIGINAL
- int nPos =::FindStringHelper (line, what, dwFlags, m_nLastFindWhatLen, m_rxnode, &m_rxmatch);
- if (nPos >= 0) // Found text!
- {
- LPTSTR pszText = line.GetBuffer (nLineLength + 1);
- m_pszMatched = _tcsdup (pszText);
- line.ReleaseBuffer ();
- // m_sMatched = line.Mid (nPos);
- if (nEolns)
- {
- CString item = line.Left (nPos);
- ptCurrentPos.y -= nEolns - HowManyStr (item, _T('\n'));
- if (ptCurrentPos.y < 0)
- ptCurrentPos.y = 0;
- LPCTSTR current = _tcsrchr (item, _T('\n'));
- if (current)
- current++;
- else
- current = item;
- ptCurrentPos.x = nPos - (current - (LPCTSTR) item);
- if (ptCurrentPos.x < 0)
- ptCurrentPos.x = 0;
- }
- else
- {
- ptCurrentPos.x = nPos;
- }
- *pptFoundPos = ptCurrentPos;
- return TRUE;
- }
- else
- m_pszMatched = NULL;
-
- ptCurrentPos.x = -1;
- ptCurrentPos.y--;
- *///END SW
}
// Beginning of text reached
@@ -4975,7 +4957,7 @@
}
// Perform search in the line
- int nPos =::FindStringHelper (line, what, dwFlags, m_nLastFindWhatLen, m_rxnode, &m_rxmatch);
+ int nPos =::FindStringHelper (line, what, dwFlags, m_nLastFindWhatLen);
if (nPos >= 0)
{
if (m_pszMatched)
Modified: trunk/Src/editlib/ccrystaltextview.h
===================================================================
--- trunk/Src/editlib/ccrystaltextview.h 2008-06-15 22:01:08 UTC (rev 5483)
+++ trunk/Src/editlib/ccrystaltextview.h 2008-06-16 04:52:20 UTC (rev 5484)
@@ -38,7 +38,6 @@
#pragma once
#endif // _MSC_VER >= 1000
-#include "cregexp.h"
#include "crystalparser.h"
////////////////////////////////////////////////////////////////////////////
@@ -707,8 +706,6 @@
static HINSTANCE s_hResourceInst;
int m_nLastFindWhatLen;
- RxNode *m_rxnode;
- RxMatchRes m_rxmatch;
LPTSTR m_pszMatched;
static LOGFONT m_LogFont;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-16 15:20:42
|
Revision: 5486
http://winmerge.svn.sourceforge.net/winmerge/?rev=5486&view=rev
Author: kimmov
Date: 2008-06-16 08:20:15 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
PATCH: [ 1994578 ] Brazilian update for 2.8.2
Submitted by Felipe Periard Lopes
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Brazilian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-16 08:05:58 UTC (rev 5485)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-16 15:20:15 UTC (rev 5486)
@@ -10,6 +10,8 @@
BugFix: ISL file syntax highlighting starts comment with { (#1981326)
BugFix: Crash when starting a second instance (#1993835)
BugFix: Crash when starting WinMerge with only one path (#1994402)
+ Translation updates:
+ - Brazilian (#1994578)
WinMerge 2.9.1.3 - 2008-06-05 (r5438)
Update PCRE (regular expression library) to version 7.7 (#1941779)
Modified: trunk/Src/Languages/Brazilian.po
===================================================================
--- trunk/Src/Languages/Brazilian.po 2008-06-16 08:05:58 UTC (rev 5485)
+++ trunk/Src/Languages/Brazilian.po 2008-06-16 15:20:15 UTC (rev 5486)
@@ -14,7 +14,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-05-26 18:00+0000\n"
+"PO-Revision-Date: 2008-06-16 18:00+0000\n"
"Last-Translator: Felipe Periard Lopes <felipefpl at ig.com.br>\n"
"Language-Team: Brazilian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -1484,7 +1484,7 @@
#: Merge.rc:1561
#, c-format
msgid "Background"
-msgstr "Cen\xE1rio de Fundo"
+msgstr "2\xBA Plano"
#: Merge.rc:901
#, c-format
@@ -1831,7 +1831,7 @@
#: Merge.rc:1156
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "Igno&rar as diferen\xE7as de retorno dos procedimentos (Windows/Unix/Mac)"
+msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)"
#: Merge.rc:1159
#, c-format
@@ -2016,9 +2016,7 @@
msgid ""
"Detect codepage info for these files : .html, .rc, .xml \n"
"need to restart session"
-msgstr ""
-"Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n"
-"precisa reiniciar a sess\xE3o"
+msgstr "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml - precisa reiniciar a sess\xE3o"
#: Merge.rc:1266
#, c-format
@@ -2050,9 +2048,7 @@
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
-msgstr ""
-"O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus\n"
-"componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada."
+msgstr "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada."
#: Merge.rc:1286
#, c-format
@@ -2064,9 +2060,7 @@
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
-msgstr ""
-"Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para vers\xF5es\n"
-"posteriores se tornem dispon\xEDveis."
+msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis."
#: Merge.rc:1290
#, c-format
@@ -2464,7 +2458,7 @@
#: Merge.rc:1558
#, c-format
msgid "Whitespace:"
-msgstr "Espa\xE7o em branco:"
+msgstr "Espa\xE7o vazio:"
#: Merge.rc:1559
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-17 16:50:35
|
Revision: 5498
http://winmerge.svn.sourceforge.net/winmerge/?rev=5498&view=rev
Author: kimmov
Date: 2008-06-17 09:50:09 -0700 (Tue, 17 Jun 2008)
Log Message:
-----------
TODO: [ 1460517 ] Use default settings from HKLM in registry
Modify installer to install WinMerge for all users.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-17 16:20:32 UTC (rev 5497)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-17 16:50:09 UTC (rev 5498)
@@ -4,6 +4,7 @@
WinMerge 2.9.1.4
Use PCRE regular expressions in the editor (#1991259)
+ Installer: install to all users (#1460517)
Update release notes (#1990886, #1995265)
Manual: Use PNG files (#1988845, #1989744)
BugFix: Temp paths in Reports created from archive file (#1984346)
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-06-17 16:20:32 UTC (rev 5497)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-06-17 16:50:09 UTC (rev 5498)
@@ -301,10 +301,10 @@
Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs')
;This removes the quick launch icon in case the user chooses not to install it after previously having it installed
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon')
+Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon')
;This removes the desktop icon in case the user chooses not to install it after previously having it installed
-Name: {userdesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
+Name: {commondesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
;Remove ANSI executable link from start menu for NT-based Windows versions
;This was installed earlier, but not anymore.
@@ -439,14 +439,14 @@
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Ukrainian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Ukrainian
;Desktop Icon
-Name: {userdesktop}\WinMerge; Filename: {app}\{code:ExeName}; Tasks: desktopicon
+Name: {commondesktop}\WinMerge; Filename: {app}\{code:ExeName}; Tasks: desktopicon
;Quick Launch Icon
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge; Filename: {app}\{code:ExeName}; Tasks: quicklaunchicon
+Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge; Filename: {app}\{code:ExeName}; Tasks: quicklaunchicon
[Registry]
-Root: HKCU; Subkey: Software\Thingamahoochie; Flags: uninsdeletekeyifempty
-Root: HKCU; Subkey: Software\Thingamahoochie\WinMerge; Flags: uninsdeletekey
+Root: HKLM; Subkey: Software\Thingamahoochie; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\Thingamahoochie\WinMerge; Flags: uninsdeletekey
;Add Project file extension (.WinMerge) to known extensions and
;set WinMerge to open those files
@@ -481,59 +481,59 @@
Root: HKLM; SubKey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\WinMergeU.exe; ValueType: string; ValueName: ; ValueData: {app}\{code:ExeName}
;Registry Keys for use by ShellExtension.dll
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge; ValueType: string; ValueName: Executable; ValueData: {app}\{code:ExeName}
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: string; ValueName: Executable; ValueData: {app}\{code:ExeName}
;Enables or disables the Context Menu preference based on what the user selects during install
;Initially the Context menu is explicitly disabled:
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: 0; Check: not IsTaskSelected('ShellExtension')
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: 0; Check: not IsTaskSelected('ShellExtension')
;If the user chose to use the context menu then we re-enable it. This is necessary so it'll turn on and off not just on.
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: 1; Tasks: ShellExtension; Check: not ShellMenuEnabled()
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: 1; Tasks: ShellExtension; Check: not ShellMenuEnabled()
;If WinMerge.exe is installed then we'll automatically configure WinMerge as the differencing application
-Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Diff Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
-Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: DiffAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
-Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
-Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff2 Params; ValueType: string; ValueName: _; ValueData: """%1"" ""%2"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Diff Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: DiffAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Diff Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Diff2 Params; ValueType: string; ValueName: _; ValueData: """%1"" ""%2"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
;Tells TortoiseCVS to use WinMerge as its differencing application (this happens whether or not Tortoise is current installed, that way
;if it is installed at a later date this will automatically support it)
-Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
-Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
-Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
-Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKLM; 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 -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
+Root: HKLM; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -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)
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000402; Flags: deletevalue; Languages: Bulgarian
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000403; Flags: deletevalue; Languages: Catalan
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000804; Flags: deletevalue; Languages: Chinese_Simplified
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000404; Flags: deletevalue; Languages: Chinese_Traditional
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041a; Flags: deletevalue; Languages: Croatian
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000405; Flags: deletevalue; Languages: Czech
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000406; Flags: deletevalue; Languages: Danish
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000413; Flags: deletevalue; Languages: Dutch
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000409; Flags: deletevalue; Languages: English
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000040c; Flags: deletevalue; Languages: French
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000407; Flags: deletevalue; Languages: German
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000408; Flags: deletevalue; Languages: Greek
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000410; Flags: deletevalue; Languages: Italian
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000411; Flags: deletevalue; Languages: Japanese
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000412; Flags: deletevalue; Languages: Korean
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000414; Flags: deletevalue; Languages: Norwegian
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000415; Flags: deletevalue; Languages: Polish
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000816; Flags: deletevalue; Languages: Portuguese
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000416; Flags: deletevalue; Languages: PortugueseBrazilian
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000418; Flags: deletevalue; Languages: Romanian
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000419; Flags: deletevalue; Languages: Russian
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041b; Flags: deletevalue; Languages: Slovak
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000c0a; Flags: deletevalue; Languages: Spanish
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041D; Flags: deletevalue; Languages: Swedish
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041f; Flags: deletevalue; Languages: Turkish
-Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000422; Flags: deletevalue; Languages: Ukrainian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000402; Flags: deletevalue; Languages: Bulgarian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000403; Flags: deletevalue; Languages: Catalan
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000804; Flags: deletevalue; Languages: Chinese_Simplified
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000404; Flags: deletevalue; Languages: Chinese_Traditional
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041a; Flags: deletevalue; Languages: Croatian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000405; Flags: deletevalue; Languages: Czech
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000406; Flags: deletevalue; Languages: Danish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000413; Flags: deletevalue; Languages: Dutch
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000409; Flags: deletevalue; Languages: English
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000040c; Flags: deletevalue; Languages: French
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000407; Flags: deletevalue; Languages: German
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000408; Flags: deletevalue; Languages: Greek
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000410; Flags: deletevalue; Languages: Italian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000411; Flags: deletevalue; Languages: Japanese
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000412; Flags: deletevalue; Languages: Korean
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000414; Flags: deletevalue; Languages: Norwegian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000415; Flags: deletevalue; Languages: Polish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000816; Flags: deletevalue; Languages: Portuguese
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000416; Flags: deletevalue; Languages: PortugueseBrazilian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000418; Flags: deletevalue; Languages: Romanian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000419; Flags: deletevalue; Languages: Russian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041b; Flags: deletevalue; Languages: Slovak
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000c0a; Flags: deletevalue; Languages: Spanish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041D; Flags: deletevalue; Languages: Swedish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041f; Flags: deletevalue; Languages: Turkish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000422; Flags: deletevalue; Languages: Ukrainian
[Run]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-22 12:41:33
|
Revision: 5505
http://winmerge.svn.sourceforge.net/winmerge/?rev=5505&view=rev
Author: kimmov
Date: 2008-06-22 05:41:31 -0700 (Sun, 22 Jun 2008)
Log Message:
-----------
PATCH: [ 1997236 ] New Slovenian translation for WinMerge
Submitted by Iztok Osredkar
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
trunk/Installer/InnoSetup/Languages/Croatian.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Danish.isl
trunk/Installer/InnoSetup/Languages/Dutch.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Installer/InnoSetup/Languages/German.isl
trunk/Installer/InnoSetup/Languages/Greek.isl
trunk/Installer/InnoSetup/Languages/Hungarian.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Korean.isl
trunk/Installer/InnoSetup/Languages/Norwegian.isl
trunk/Installer/InnoSetup/Languages/Polish.isl
trunk/Installer/InnoSetup/Languages/Portuguese.isl
trunk/Installer/InnoSetup/Languages/Romanian.isl
trunk/Installer/InnoSetup/Languages/Russian.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Swedish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
trunk/Installer/InnoSetup/Languages/Ukrainian.isl
trunk/Installer/InnoSetup/WinMerge.iss
Added Paths:
-----------
trunk/Installer/InnoSetup/Languages/Slovenian.isl
trunk/Src/Languages/Slovenian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-22 12:41:31 UTC (rev 5505)
@@ -11,6 +11,7 @@
BugFix: ISL file syntax highlighting starts comment with { (#1981326)
BugFix: Crash when starting a second instance (#1993835)
BugFix: Crash when starting WinMerge with only one path (#1994402)
+ New translation: Slovenian (#1997236)
Translation updates:
- Brazilian (#1994578)
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -356,6 +356,7 @@
RomanianLanguage=Menus e di\xE1logos romenos
RussianLanguage=Menus e di\xE1logos russos
SlovakLanguage=Menus e di\xE1logos eslovacos
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Menus e di\xE1logos espanh\xF3is
SwedishLanguage=Menus e di\xE1logos suecos
TurkishLanguage=Menus e di\xE1logos turcos
Modified: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -359,6 +359,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -342,6 +342,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Men\xFAs i di\xE0legs en Rus
SlovakLanguage=Men\xFAs i di\xE0legs en Eslovac
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Men\xFAs i di\xE0legs en Castell\xE0
SwedishLanguage=Men\xFAs i di\xE0legs en Suec
TurkishLanguage=Men\xFAs i di\xE0legs en Turc
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -349,6 +349,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -356,6 +356,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Croatian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Croatian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Croatian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -352,6 +352,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -357,6 +357,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Danish.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Danish.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -358,6 +358,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Dutch.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Dutch.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -336,6 +336,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -359,6 +359,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -351,6 +351,7 @@
RomanianLanguage=Menus et dialogues Roumain
RussianLanguage=Menus et dialogues Russe
SlovakLanguage=Menus et dialogues Slovaque
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Menus et dialogues Espagnol
SwedishLanguage=Menus et dialogues Su\xE9dois
TurkishLanguage=Menus et dialogues Turque
Modified: trunk/Installer/InnoSetup/Languages/German.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/German.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/German.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -348,6 +348,7 @@
RomanianLanguage=Rum\xE4nisch Men\xFCs und Dialoge
RussianLanguage=Russische Men\xFCs und Dialoge
SlovakLanguage=Slowakische Men\xFCs und Dialoge
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanische Men\xFCs und Dialoge
SwedishLanguage=Schwedische Men\xFCs und Dialoge
TurkishLanguage=T\xFCrkische Men\xFCs und Dialoge
Modified: trunk/Installer/InnoSetup/Languages/Greek.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Greek.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Greek.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -357,6 +357,7 @@
PortugueseLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
RussianLanguage=\xD1\xF9\xF3\xF3\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SlovakLanguage=\xD3\xEB\xEF\xE2\xE1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=\xC9\xF3\xF0\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SwedishLanguage=\xD3\xEF\xF5\xE7\xE4\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
TurkishLanguage=\xD4\xEF\xF5\xF1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
Modified: trunk/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Hungarian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Hungarian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -378,6 +378,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Orosz men\xFCk \xE9s p\xE1rbesz\xE9dablakok
SlovakLanguage=Szlov\xE1k men\xFCk \xE9s p\xE1rbesz\xE9dablakok
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanyol men\xFCk \xE9s p\xE1rbesz\xE9dablakok
SwedishLanguage=Sv\xE9d men\xFCk \xE9s p\xE1rbesz\xE9dablakok
TurkishLanguage=t\xF6r\xF6k men\xFCk \xE9s p\xE1rbesz\xE9dablakok
Modified: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -362,6 +362,7 @@
RomanianLanguage=Menu e finestre di dialogo in Romeno
RussianLanguage=Menu e finestre di dialogo in russo
SlovakLanguage=Menu e finestre di dialogo in slovacco
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Menu e finestre di dialogo in spagnolo
SwedishLanguage=Menu e finestre di dialogo in svedese
TurkishLanguage=Menu e finestre di dialogo in turco
Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -351,6 +351,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Korean.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Korean.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -363,6 +363,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Norwegian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Norwegian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -355,6 +355,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russiske menyer og dialoger
SlovakLanguage=Slovakiske menyer og dialoger
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanske menyer og dialoger
SwedishLanguage=Svenske menyer og dialoger
TurkishLanguage=T\xFCrk\xE7e menyer og dialoger
Modified: trunk/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Polish.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Polish.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -348,6 +348,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Rosyjski interfejs
SlovakLanguage=Slowacki interfejs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Hiszpanski interfejs
SwedishLanguage=Szwedzki interfejs
TurkishLanguage=turecki interfejs
Modified: trunk/Installer/InnoSetup/Languages/Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Portuguese.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Portuguese.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -340,6 +340,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Romanian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Romanian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Romanian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -359,6 +359,7 @@
RomanianLanguage=Meniuri si dialoguri \xEEn Rom\xE2na
RussianLanguage=Meniuri si dialoguri \xEEn Rusa
SlovakLanguage=Meniuri si dialoguri \xEEn Slovaca
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Meniuri si dialoguri \xEEn Spaniola
SwedishLanguage=Meniuri si dialoguri \xEEn Suedeza
TurkishLanguage=Meniuri si dialoguri \xEEn Turca
Modified: trunk/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Russian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Russian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -346,6 +346,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -287,6 +287,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Rusk\xE9 ponuky a dial\xF3gy
SlovakLanguage=Slovensk\xE9 ponuky a dial\xF3gy
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=\x8Apanielske ponuky a dial\xF3gy
SwedishLanguage=\x8Av\xE9dske ponuky a dial\xF3gy
TurkishLanguage=Tureck\xE9 ponuky a dial\xF3gy
Added: trunk/Installer/InnoSetup/Languages/Slovenian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovenian.isl (rev 0)
+++ trunk/Installer/InnoSetup/Languages/Slovenian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -0,0 +1,374 @@
+; *** Inno Setup version 5.1.11+ Slovenian messages ***
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/is3rdparty.php
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+;
+; Maintained by Miha Remec (mr...@gm...)
+;
+; $jrsoftware: issrc/Files/Languages/Slovenian.isl,v 1.14 2007/02/27 18:22:41 jr Exp $
+
+[LangOptions]
+LanguageName=Slovenski
+LanguageID=$0424
+LanguageCodePage=1250
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Namestitev
+SetupWindowTitle=Namestitev - %1
+UninstallAppTitle=Odstranitev
+UninstallAppFullTitle=Odstranitev programa %1
+
+; *** Misc. common
+InformationTitle=Informacija
+ConfirmTitle=Potrditev
+ErrorTitle=Napaka
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=V ra\xE8unalnik boste namestili program %1. \x8Eelite nadaljevati?
+LdrCannotCreateTemp=Ne morem ustvariti za\xE8asne datoteke. Namestitev je prekinjena
+LdrCannotExecTemp=Ne morem zagnati datoteke v za\xE8asni mapi. Namestitev je prekinjena
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nNapaka %2: %3
+SetupFileMissing=Manjka datoteka %1. Odpravite napako ali si priskrbite drugo kopijo programa.
+SetupFileCorrupt=Datoteke namestitvenega programa so okvarjene. Priskrbite si drugo kopijo programa.
+SetupFileCorruptOrWrongVer=Datoteke so okvarjene ali nezdru\x9Eljive s to razli\xE8ico namestitvenega programa. Odpravite napako ali si priskrbite drugo kopijo programa.
+NotOnThisPlatform=Program ni namenjen za uporabo v %1.
+OnlyOnThisPlatform=Program je namenjen za uporabo v %1.
+OnlyOnTheseArchitectures=Program lahko namestite le na razli\xE8icah MS Windows sistemov, ki so na\xE8rtovani za naslednje tipe procesorjev:%n%n%1
+MissingWOW64APIs=Razli\xE8ica MS Windows, ki jo uporabljate, ne vsebuje okolja, ki ga zahteva namestitveni program za izvedbo 64-bitne namestitve. Problem odpravite z namestitvijo servisnega paketa %1.
+WinVersionTooLowError=Ta program zahteva %1 razli\xE8ico %2 ali novej\x9Ao.
+WinVersionTooHighError=Tega programa ne morete namestiti v %1 razli\xE8ice %2 ali novej\x9Ae.
+AdminPrivilegesRequired=Namestitev programa lahko opravi le administrator.
+PowerUserPrivilegesRequired=Namestitev programa lahko opravi le administrator ali zahtevni uporabnik.
+SetupAppRunningError=Program %1 je trenutno odprt.%n%nZaprite program, nato kliknite V redu za nadaljevanje ali Prekini za izhod.
+UninstallAppRunningError=Program %1 je trenutno odprt.%n%nZaprite program, nato kliknite V redu za nadaljevanje ali Prekini za izhod.
+
+; *** Misc. errors
+ErrorCreatingDir=Namestitveni program ni mogel ustvariti mape "%1"
+ErrorTooManyFilesInDir=Namestitveni program ne more ustvariti nove datoteke v mapi "%1", ker vsebuje mapa preve\xE8 datotek
+
+; *** Setup common messages
+ExitSetupTitle=Prekini namestitev
+ExitSetupMessage=Namestitev ni kon\xE8ana. \xC8e jo boste prekinili, program ne bo name\x9A\xE8en.%n%nPonovno namestitev lahko izvedete kasneje.%n%n\x8Eelite prekiniti namestitev?
+AboutSetupMenuItem=&O namestitvenem programu...
+AboutSetupTitle=O namestitvenem programu
+AboutSetupMessage=%1 razli\xE8ica %2%n%3%n%n%1 doma\xE8a stran:%n%4
+AboutSetupNote=
+TranslatorNote=Slovenski prevod: Miha Remec%n(inn...@mi...)
+
+; *** Buttons
+ButtonBack=< Na&zaj
+ButtonNext=&Naprej >
+ButtonInstall=&Namesti
+ButtonOK=V redu
+ButtonCancel=Prekini
+ButtonYes=&Da
+ButtonYesToAll=Da za &vse
+ButtonNo=&Ne
+ButtonNoToAll=N&e za vse
+ButtonFinish=&Kon\xE8aj
+ButtonBrowse=&Prebrskaj...
+ButtonWizardBrowse=P&rebrskaj...
+ButtonNewFolder=&Ustvari novo mapo
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Izbira jezika namestitve
+SelectLanguageLabel=Izberite jezik, ki ga \x9Eelite uporabljati med namestitvijo:
+
+; *** Common wizard text
+ClickNext=Kliknite Naprej za nadaljevanje namestitve ali Prekini za prekinitev namestitve.
+BeveledLabel=
+BrowseDialogTitle=Izbira mape
+BrowseDialogLabel=Izberite mapo s spiska, nato kliknite V redu.
+NewFolderName=Nova mapa
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Dobrodo\x9Ali v namestitev programa [name].
+WelcomeLabel2=V ra\xE8unalnik boste namestili program [name/ver].%n%nPriporo\xE8ljivo je, da pred za\xE8etkom namestitve zaprete vse odprte programe.
+
+; *** "Password" wizard page
+WizardPassword=Geslo
+PasswordLabel1=Namestitev je za\x9A\xE8itena z geslom.
+PasswordLabel3=Vpi\x9Aite geslo, nato kliknite Naprej za nadaljevanje. Pri vpisu pazite na male in velike \xE8rke.
+PasswordEditLabel=&Geslo:
+IncorrectPassword=Geslo, ki ste ga vpisali, ni pravilno. Vpi\x9Aite pravilno geslo.
+
+; *** "License Agreement" wizard page
+WizardLicense=Licen\xE8na pogodba za uporabo programa
+LicenseLabel=Pred nadaljevanjem preberite licen\xE8no pogodbo za uporabo programa.
+LicenseLabel3=Preberite licen\xE8no pogodbo za uporabo programa. Program lahko namestite le, \xE8e se s pogodbo v celoti strinjate.
+LicenseAccepted=&Da, sprejemam vse pogoje licen\xE8ne pogodbe
+LicenseNotAccepted=N&e, pogojev licen\xE8ne pogodbe ne sprejmem
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informacije
+InfoBeforeLabel=Pred nadaljevanjem preberite naslednje pomembne informacije.
+InfoBeforeClickLabel=Ko boste pripravljeni za nadaljevanje namestitve, kliknite Naprej.
+WizardInfoAfter=Informacije
+InfoAfterLabel=Pred nadaljevanjem preberite naslednje pomembne informacije.
+InfoAfterClickLabel=Ko boste pripravljeni za nadaljevanje namestitve, kliknite Naprej.
+
+; *** "User Information" wizard page
+WizardUserInfo=Podatki o uporabniku
+UserInfoDesc=Vpi\x9Aite svoje podatke.
+UserInfoName=&Ime:
+UserInfoOrg=&Podjetje:
+UserInfoSerial=&Serijska \x9Atevilka:
+UserInfoNameRequired=Vpis imena je obvezen.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Izbira ciljnega mesta
+SelectDirDesc=Kam \x9Eelite namestiti program [name]?
+SelectDirLabel3=Program [name] bo name\x9A\xE8en v naslednjo mapo.
+SelectDirBrowseLabel=Za nadaljevanje kliknite Naprej. \xC8e \x9Eelite izbrati drugo mapo, kliknite Prebrskaj.
+DiskSpaceMBLabel=Na disku mora biti vsaj [mb] MB prostora.
+ToUNCPathname=Programa ne morete namestiti v UNC pot. \xC8e \x9Eelite namestiti v omre\x9Eje, se morate povezati z omre\x9Enim pogonom.
+InvalidPath=Vpisati morate polno pot vklju\xE8no z oznako pogona. Primer:%n%nC:\PROGRAM%n%nali UNC pot v obliki:%n%n\\stre\x9Enik\mapa_skupne_rabe
+InvalidDrive=Izbrani pogon ali UNC skupna raba ne obstaja ali ni dostopna. Izberite drugega.
+DiskSpaceWarningTitle=Na disku ni dovolj prostora
+DiskSpaceWarning=Namestitev potrebuje vsaj %1 KB prostora, toda na izbranem pogonu je na voljo le %2 KB.%n%n\x8Eelite kljub temu nadaljevati?
+DirNameTooLong=Ime mape ali poti je predolgo.
+InvalidDirName=Ime mape ni veljavno.
+BadDirName32=Ime mape ne sme vsebovati naslednjih znakov:%n%n%1
+DirExistsTitle=Mapa \x9Ee obstaja
+DirExists=Mapa%n%n%1%n%n\x9Ee obstaja. \x8Eelite program vseeno namestiti v to mapo?
+DirDoesntExistTitle=Mapa ne obstaja
+DirDoesntExist=Mapa %n%n%1%n%nne obstaja. \x8Eelite ustvariti to mapo?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Izbira komponent
+SelectComponentsDesc=Katere komponente \x9Eelite namestiti?
+SelectComponentsLabel2=Ozna\xE8ite komponente, ki jih \x9Eelite namestiti; odzna\xE8ite komponente, ki jih ne \x9Eelite namestiti. Kliknite Naprej, ko boste pripravljeni za nadaljevanje.
+FullInstallation=Polna namestitev
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Osnovna namestitev
+CustomInstallation=Nastavljiva namestitev
+NoUninstallWarningTitle=Komponente \x9Ee obstajajo
+NoUninstallWarning=Namestitveni program je ugotovil, da so naslednje komponente \x9Ee name\x9A\xE8ene v ra\xE8unalniku:%n%n%1%n%nOdzna\xE8itev teh komponent \x9Ae ne pomeni tudi njihove odstranitve.%n%n\x8Eelite vseeno nadaljevati?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Za izbrano namestitev potrebujete vsaj [mb] MB prostora na disku.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Izbira dodatnih opravil
+SelectTasksDesc=Katera dodatna opravila \x9Eelite izvesti?
+SelectTasksLabel2=Izberite dodatna opravila, ki jih bo namestitveni program opravil med namestitvijo programa [name], nato kliknite Naprej.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Izbira mape v meniju \xBBStart\xAB
+SelectStartMenuFolderDesc=Kje naj namestitveni program ustvari programske ikone?
+SelectStartMenuFolderLabel3=Namestitveni program bo ustvaril programske ikone v naslednji mapi v meniju \xBBStart\xAB.
+SelectStartMenuFolderBrowseLabel=Za nadaljevanje kliknite Naprej. \xC8e \x9Eelite izbrati drugo mapo, kliknite Prebrskaj.
+MustEnterGroupName=Ime skupine mora biti vpisano.
+GroupNameTooLong=Ime mape ali poti je predolgo.
+InvalidGroupName=Ime mape ni veljavno.
+BadGroupName=Ime skupine ne sme vsebovati naslednjih znakov:%n%n%1
+NoProgramGroupCheck2=&Ne ustvari mape v meniju \xBBStart\xAB
+
+; *** "Ready to Install" wizard page
+WizardReady=Pripravljen za namestitev
+ReadyLabel1=Namestitveni program je pripravljen za namestitev programa [name] v va\x9A ra\xE8unalnik.
+ReadyLabel2a=Kliknite Namesti za za\xE8etek name\x9A\xE8anja. Kliknite Nazaj, \xE8e \x9Eelite pregledati ali spremeniti katerokoli nastavitev.
+ReadyLabel2b=Kliknite Namesti za za\xE8etek name\x9A\xE8anja.
+ReadyMemoUserInfo=Podatki o uporabniku:
+ReadyMemoDir=Ciljno mesto:
+ReadyMemoType=Tip namestitve:
+ReadyMemoComponents=Izbrane komponente:
+ReadyMemoGroup=Mapa v meniju \xBBStart\xAB:
+ReadyMemoTasks=Dodatna opravila:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Pripravljam za namestitev
+PreparingDesc=Namestitveni program je pripravljen za namestitev programa [name] v va\x9A ra\xE8unalnik.
+PreviousInstallNotCompleted=Namestitev/odstranitev prej\x9Anjega programa ni bila kon\xE8ana. Da bi jo dokon\xE8ali, morate ra\xE8unalnik ponovno zagnati.%n%nPo ponovnem zagonu ra\xE8unalnika ponovno odprite namestitveni program, da boste kon\xE8ali namestitev programa [name].
+CannotContinue=Namestitveni program ne more nadaljevati. Pritisnite Prekini za izhod.
+
+; *** "Installing" wizard page
+WizardInstalling=Name\x9A\xE8anje
+InstallingLabel=Po\xE8akajte, da bo program [name] name\x9A\xE8en v va\x9A ra\xE8unalnik.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Zaklju\xE8ek namestitve programa [name]
+FinishedLabelNoIcons=Program [name] je name\x9A\xE8en v va\x9A ra\xE8unalnik.
+FinishedLabel=Program [name] je name\x9A\xE8en v va\x9A ra\xE8unalnik. Program za\x9Eenete tako, da odprete pravkar ustvarjene programske ikone.
+ClickFinish=Kliknite tipko Kon\xE8aj za zaklju\xE8ek namestitve.
+FinishedRestartLabel=Za dokon\xE8anje namestitve programa [name] morate ra\xE8unalnik znova zagnati. Ali ga \x9Eelite znova zagnati zdaj?
+FinishedRestartMessage=Za dokon\xE8anje namestitve programa [name] morate ra\xE8unalnik znova zagnati. %n%nAli ga \x9Eelite znova zagnati zdaj?
+ShowReadmeCheck=\x8Eelim prebrati datoteko z navodili
+YesRadio=&Da, ra\xE8unalnik znova za\x9Eeni zdaj
+NoRadio=&Ne, ra\xE8unalnik bom znova zagnal pozneje
+
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Odpri %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Preberi %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Namestitveni program potrebuje naslednjo disketo
+SelectDiskLabel2=Vstavite disketo %1 and kliknite V redu.%n%n\xC8e se datoteke s te diskete nahajajo v drugi mapi, kot je navedena spodaj, vpi\x9Aite pravilno pot ali kliknite Prebrskaj.
+PathLabel=&Pot:
+FileNotInDir2=Datoteke "%1" ni v mapi "%2". Vstavite pravilno disketo ali izberite drugo mapo.
+SelectDirectoryLabel=Vpi\x9Aite lokacijo naslednje diskete.
+
+; *** Installation phase messages
+SetupAborted=Namestitev ni bila kon\xE8ana.%n%nOdpravite te\x9Eavo in znova odprite namestitveni program.
+EntryAbortRetryIgnore=Kliknite Ponovi za ponovitev, P...
[truncated message content] |
|
From: <ki...@us...> - 2008-06-22 12:59:03
|
Revision: 5506
http://winmerge.svn.sourceforge.net/winmerge/?rev=5506&view=rev
Author: kimmov
Date: 2008-06-22 05:58:52 -0700 (Sun, 22 Jun 2008)
Log Message:
-----------
BugFix: Messages missing from installer translations
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/Greek.isl
trunk/Installer/InnoSetup/Languages/Slovenian.isl
trunk/Installer/InnoSetup/Languages/Ukrainian.isl
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-22 12:41:31 UTC (rev 5505)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-22 12:58:52 UTC (rev 5506)
@@ -11,6 +11,7 @@
BugFix: ISL file syntax highlighting starts comment with { (#1981326)
BugFix: Crash when starting a second instance (#1993835)
BugFix: Crash when starting WinMerge with only one path (#1994402)
+ BugFix: Messages missing from installer translations (r5506)
New translation: Slovenian (#1997236)
Translation updates:
- Brazilian (#1994578)
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-06-22 12:41:31 UTC (rev 5505)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-06-22 12:58:52 UTC (rev 5506)
@@ -346,6 +346,7 @@
FrenchLanguage=Menus e di\xE1logos franceses
GermanLanguage=Menus e di\xE1logos alem\xE3es
GreekLanguage=Greek menus and dialogs
+HungarianLanguage=Hungarian menus and dialogs
ItalianLanguage=Menus e di\xE1logos italianos
JapaneseLanguage=Menus e di\xE1logos japoneses
KoreanLanguage=Menus e di\xE1logos coreanos
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-06-22 12:41:31 UTC (rev 5505)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-06-22 12:58:52 UTC (rev 5506)
@@ -269,7 +269,7 @@
ErrorRestartReplace=\xB8\xB2\xB8\xC7ʧ\xB0ܣ\xBA
ErrorRenamingTemp=\xB5\xB1\xCA\xD4ͼ\xB8\xF8Ŀ\xB5\xC4Ŀ¼\xD6\xD0\xCEļ\xFE\xB8\xC4\xC3\xFBʱʧ\xB0ܣ\xBA
ErrorRegisterServer=\xCE\xA8ע\xB2\xE1 DLL/OCX\xA3\xBA %1
-ErrorRegisterServerMissingExport=DllRegisterServer֧\xB3\xD6δ\xB7\xA2\xCF\xD6
+ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
ErrorRegisterTypeLib=\xCE\xA8ע\xB2\xE1\xC0\xE0\xD0ͣ\xBA%1
; *** Post-installation errors
Modified: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2008-06-22 12:41:31 UTC (rev 5505)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2008-06-22 12:58:52 UTC (rev 5506)
@@ -275,7 +275,7 @@
ErrorRestartReplace=RestartReplace failed:
ErrorRenamingTemp=An error occurred while trying to rename a file in the destination directory:
ErrorRegisterServer=Unable to register the DLL/OCX: %1
-ErrorRegisterServerMissingExport=DllRegisterServer export not found
+ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
ErrorRegisterTypeLib=Unable to register the type library: %1
; *** Post-installation errors
Modified: trunk/Installer/InnoSetup/Languages/Greek.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Greek.isl 2008-06-22 12:41:31 UTC (rev 5505)
+++ trunk/Installer/InnoSetup/Languages/Greek.isl 2008-06-22 12:58:52 UTC (rev 5506)
@@ -275,7 +275,7 @@
ErrorRestartReplace=RestartReplace failed:
ErrorRenamingTemp=An error occurred while trying to rename a file in the destination directory:
ErrorRegisterServer=Unable to register the DLL/OCX: %1
-ErrorRegisterServerMissingExport=DllRegisterServer export not found
+ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
ErrorRegisterTypeLib=Unable to register the type library: %1
; *** Post-installation errors
@@ -347,6 +347,7 @@
DutchLanguage=\xCF\xEB\xEB\xE1\xED\xE4\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
FrenchLanguage=\xC3\xE1\xEB\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
GermanLanguage=\xC3\xE5\xF1\xEC\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
+GreekLanguage=Greek menus and dialogs
HungarianLanguage=\xCF\xF5\xE3\xE3\xF1\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
ItalianLanguage=\xC9\xF4\xE1\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
JapaneseLanguage=\xC9\xE1\xF0\xF9\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
@@ -355,6 +356,7 @@
PolishLanguage=\xD0\xEF\xEB\xF9\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
PortugueseBrazilLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC (\xC2\xF1\xE1\xE6\xE9\xEB\xDF\xE1\xF2) \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
PortugueseLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
+RomanianLanguage=Romanian menus and dialogs
RussianLanguage=\xD1\xF9\xF3\xF3\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SlovakLanguage=\xD3\xEB\xEF\xE2\xE1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SlovenianLanguage=Slovenian menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Slovenian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovenian.isl 2008-06-22 12:41:31 UTC (rev 5505)
+++ trunk/Installer/InnoSetup/Languages/Slovenian.isl 2008-06-22 12:58:52 UTC (rev 5506)
@@ -298,6 +298,7 @@
NameAndVersion=%1 razli\xE8ica %2
AdditionalIcons=Dodatne ikone:
+OptionalFeatures=Optional Features:
CreateDesktopIcon=Ustvari ikono na &namizju
CreateQuickLaunchIcon=Ustvari ikono za &hitri zagon
ProgramOnTheWeb=%1 na spletu
Modified: trunk/Installer/InnoSetup/Languages/Ukrainian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Ukrainian.isl 2008-06-22 12:41:31 UTC (rev 5505)
+++ trunk/Installer/InnoSetup/Languages/Ukrainian.isl 2008-06-22 12:58:52 UTC (rev 5506)
@@ -343,6 +343,7 @@
DutchLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xE3\xEE\xEB\xEB\xE0\xED\xE4\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
FrenchLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xF4\xF0\xE0\xED\xF6\xF3\xE7\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
GermanLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xED\xB3\xEC\xE5\xF6\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
+ GreekLanguage=Greek menus and dialogs
HungarianLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xE1\xEE\xEB\xE3\xE0\xF0\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
ItalianLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xB3\xF2\xE0\xEB\xB3\xE9\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
JapaneseLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xFF\xEF\xEE\xED\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-23 14:33:05
|
Revision: 5508
http://winmerge.svn.sourceforge.net/winmerge/?rev=5508&view=rev
Author: kimmov
Date: 2008-06-23 07:32:03 -0700 (Mon, 23 Jun 2008)
Log Message:
-----------
PATCH: [ 2000307 ] Swedish.isl translation update for Slovenian language
Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/Languages/Swedish.isl
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-22 17:35:42 UTC (rev 5507)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-23 14:32:03 UTC (rev 5508)
@@ -15,6 +15,7 @@
New translation: Slovenian (#1997236)
Translation updates:
- Brazilian (#1994578)
+ - Swedish (#2000307)
WinMerge 2.9.1.3 - 2008-06-05 (r5438)
Update PCRE (regular expression library) to version 7.7 (#1941779)
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-06-22 17:35:42 UTC (rev 5507)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-06-23 14:32:03 UTC (rev 5508)
@@ -349,7 +349,7 @@
RomanianLanguage=Rum\xE4nska menyer och dialoger
RussianLanguage=Ryska menyer och dialoger
SlovakLanguage=Slovakiska menyer och dialoger
-SlovenianLanguage=Slovenian menus and dialogs
+SlovenianLanguage=Slovenska menyer och dialoger
SpanishLanguage=Spanska menyer och dialoger
SwedishLanguage=Svenska menyer och dialoger
TurkishLanguage=Turkiska menyer och dialoger
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-23 23:01:18
|
Revision: 5512
http://winmerge.svn.sourceforge.net/winmerge/?rev=5512&view=rev
Author: kimmov
Date: 2008-06-23 16:01:12 -0700 (Mon, 23 Jun 2008)
Log Message:
-----------
PATCH: [ 2001237 ] Proper source displaying in "Confirm Copy" dialog
Submitted by Denis Matiukha
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Src/DirActions.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-23 22:54:36 UTC (rev 5511)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-23 23:01:12 UTC (rev 5512)
@@ -12,6 +12,8 @@
BugFix: Crash when starting a second instance (#1993835)
BugFix: Crash when starting WinMerge with only one path (#1994402)
BugFix: Messages missing from installer translations (r5506)
+ BugFix: Always right side as origin side in copy confirmation dialog
+ when Copy To... (#2001237)
New translation: Slovenian (#1997236)
Translation updates:
- Brazilian (#1994578)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2008-06-23 22:54:36 UTC (rev 5511)
+++ trunk/Docs/Users/Contributors.txt 2008-06-23 23:01:12 UTC (rev 5512)
@@ -139,6 +139,7 @@
* Vladimir Lukianov
* David Maisonave
* Dmitry Maslov
+* Denis Matiukha
* Harry Mckame
* Oliver Mellet
* Andreas Morsing
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2008-06-23 22:54:36 UTC (rev 5511)
+++ trunk/Src/DirActions.cpp 2008-06-23 23:01:12 UTC (rev 5512)
@@ -554,6 +554,7 @@
act.context = sel;
act.atype = actType;
act.UIResult = FileActionItem::UI_DONT_CARE;
+ act.UIOrigin = FileActionItem::UI_LEFT;
actionScript.AddActionItem(act);
++selCount;
}
@@ -624,6 +625,7 @@
act.context = sel;
act.atype = actType;
act.UIResult = FileActionItem::UI_DONT_CARE;
+ act.UIOrigin = FileActionItem::UI_RIGHT;
actionScript.AddActionItem(act);
++selCount;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-26 21:09:59
|
Revision: 5529
http://winmerge.svn.sourceforge.net/winmerge/?rev=5529&view=rev
Author: kimmov
Date: 2008-06-26 14:08:41 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
PATCH: [ 2003203 ] Remove debug info from release executables
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Merge.vcproj
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-26 20:44:13 UTC (rev 5528)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-26 21:08:41 UTC (rev 5529)
@@ -6,6 +6,7 @@
WinMerge 2.9.1.5
Manual: Copy editing (#2000322)
Manual: Clarify 64-bit support (#2002431)
+ Reduce executable sizes (#2003203)
WinMerge 2.9.1.4 - 2008-06-24 (r5518)
Use PCRE regular expressions in the editor (#1991259)
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-06-26 20:44:13 UTC (rev 5528)
+++ trunk/Src/Merge.vcproj 2008-06-26 21:08:41 UTC (rev 5529)
@@ -39,7 +39,7 @@
ProgramDataBaseFileName=".\..\BuildTmp\MergeUnicodeRelease/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -51,9 +51,9 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre"
- IgnoreDefaultLibraryNames="msvcrtd.lib"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\BuildTmp\MergeUnicodeRelease/WinMergeU.pdb"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="FALSE"
+ ProgramDatabaseFile=""
SubSystem="2"
EntryPointSymbol="wWinMainCRTStartup"
TargetMachine="1"/>
@@ -258,7 +258,7 @@
ProgramDataBaseFileName=".\..\BuildTmp\MergeRelease/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -270,9 +270,9 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre"
- IgnoreDefaultLibraryNames="msvcrtd.lib"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\BuildTmp\MergeRelease/WinMerge.pdb"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="FALSE"
+ ProgramDatabaseFile=""
SubSystem="2"
TargetMachine="1"/>
<Tool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-06-28 11:13:58
|
Revision: 5537
http://winmerge.svn.sourceforge.net/winmerge/?rev=5537&view=rev
Author: sdottaka
Date: 2008-06-28 04:13:51 -0700 (Sat, 28 Jun 2008)
Log Message:
-----------
BUG: [ 2004160 ] Possible crash when enabling line filter
rename buffer::used to buffer::sizeof
rename buffer::size to buffer::capacity
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Common/UniFile.cpp
trunk/Src/Common/unicoder.cpp
trunk/Src/Common/unicoder.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-27 19:15:26 UTC (rev 5536)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-28 11:13:51 UTC (rev 5537)
@@ -7,6 +7,7 @@
Manual: Copy editing (#2000322)
Manual: Clarify 64-bit support (#2002431)
Reduce executable sizes (#2003203)
+ BugFix: Possible crash when enabling line filter (#2004160)
WinMerge 2.9.1.4 - 2008-06-24 (r5518)
Use PCRE regular expressions in the editor (#1991259)
Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp 2008-06-27 19:15:26 UTC (rev 5536)
+++ trunk/Src/Common/UniFile.cpp 2008-06-28 11:13:51 UTC (rev 5537)
@@ -925,8 +925,8 @@
int srcbytes = line.GetLength() * sizeof(TCHAR);
bool lossy = ucr::convert(unicoding1, codepage1, src, srcbytes, (ucr::UNICODESET)m_unicoding, m_codepage, buff);
// TODO: What to do about lossy conversion ?
- unsigned int wbytes = fwrite(buff->ptr, 1, buff->used, m_fp);
- if (wbytes != buff->used)
+ unsigned int wbytes = fwrite(buff->ptr, 1, buff->size, m_fp);
+ if (wbytes != buff->size)
return FALSE;
return TRUE;
}
Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp 2008-06-27 19:15:26 UTC (rev 5536)
+++ trunk/Src/Common/unicoder.cpp 2008-06-28 11:13:51 UTC (rev 5537)
@@ -606,9 +606,9 @@
buffer::buffer(unsigned int needed)
{
- used = 0;
- size = needed;
- ptr = (unsigned char *)calloc(size, 1);
+ size = 0;
+ capacity = needed;
+ ptr = (unsigned char *)calloc(capacity, 1);
}
buffer::~buffer()
{
@@ -616,10 +616,10 @@
}
void buffer::resize(unsigned int needed)
{
- if (size < needed)
+ if (capacity < needed)
{
- size = needed;
- ptr = (unsigned char *)realloc(ptr, size);
+ capacity = needed;
+ ptr = (unsigned char *)realloc(ptr, capacity);
}
}
@@ -633,7 +633,7 @@
// simple byte copy
dest->resize(srcbytes);
CopyMemory(dest->ptr, src, srcbytes);
- dest->used = srcbytes;
+ dest->size = srcbytes;
return true;
}
if ((unicoding1 == UCS2LE && unicoding2 == UCS2BE)
@@ -647,15 +647,15 @@
dest->ptr[i] = src[i+1];
dest->ptr[i+1] = src[i];
}
- dest->used = srcbytes;
+ dest->size = srcbytes;
return true;
}
if (unicoding1 != UCS2LE && unicoding2 != UCS2LE)
{
// Break problem into two simpler pieces by converting through UCS-2LE
- buffer intermed(dest->size);
+ buffer intermed(dest->capacity);
bool step1 = convert(unicoding1, codepage1, src, srcbytes, UCS2LE, 0, &intermed);
- bool step2 = convert(UCS2LE, 0, intermed.ptr, intermed.used, unicoding2, codepage2, dest);
+ bool step2 = convert(UCS2LE, 0, intermed.ptr, intermed.size, unicoding2, codepage2, dest);
return step1 && step2;
}
if (unicoding1 == UCS2LE)
@@ -669,8 +669,8 @@
int bytes = WideCharToMultiByte(destcp, flags, (LPCWSTR)src, srcbytes/2, 0, 0, NULL, NULL);
dest->resize(bytes);
int losses = 0;
- bytes = WideCharToMultiByte(destcp, flags, (LPCWSTR)src, srcbytes/2, (char *)dest->ptr, dest->size, NULL, NULL);
- dest->used = bytes;
+ bytes = WideCharToMultiByte(destcp, flags, (LPCWSTR)src, srcbytes/2, (char *)dest->ptr, dest->capacity, NULL, NULL);
+ dest->size = bytes;
return losses==0;
}
else
@@ -680,8 +680,8 @@
DWORD flags = 0;
int wchars = MultiByteToWideChar(srccp, flags, (LPCSTR)src, srcbytes, 0, 0);
dest->resize(wchars*2);
- wchars = MultiByteToWideChar(srccp, flags, (LPCSTR)src, srcbytes, (LPWSTR)dest->ptr, dest->size/2);
- dest->used = wchars * 2;
+ wchars = MultiByteToWideChar(srccp, flags, (LPCSTR)src, srcbytes, (LPWSTR)dest->ptr, dest->capacity/2);
+ dest->size = wchars * 2;
return true;
}
}
Modified: trunk/Src/Common/unicoder.h
===================================================================
--- trunk/Src/Common/unicoder.h 2008-06-27 19:15:26 UTC (rev 5536)
+++ trunk/Src/Common/unicoder.h 2008-06-28 11:13:51 UTC (rev 5537)
@@ -16,8 +16,8 @@
struct buffer {
unsigned char * ptr;
+ unsigned int capacity;
unsigned int size;
- unsigned int used;
buffer(unsigned int needed);
~buffer();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-06-29 17:04:52
|
Revision: 5541
http://winmerge.svn.sourceforge.net/winmerge/?rev=5541&view=rev
Author: sdottaka
Date: 2008-06-29 10:04:48 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
PATCH: [ 2005031 ] Fix location pane flickering(2)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/LocationView.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-29 08:11:20 UTC (rev 5540)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-29 17:04:48 UTC (rev 5541)
@@ -8,6 +8,7 @@
Manual: Clarify 64-bit support (#2002431)
Reduce executable sizes (#2003203)
BugFix: Possible crash when enabling line filter (#2004160)
+ BugFix: Location Pane flickers when scrolling (#1938177, #2005031)
WinMerge 2.9.1.4 - 2008-06-24 (r5518)
Use PCRE regular expressions in the editor (#1991259)
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2008-06-29 08:11:20 UTC (rev 5540)
+++ trunk/Src/LocationView.cpp 2008-06-29 17:04:48 UTC (rev 5541)
@@ -112,9 +112,8 @@
ON_WM_CONTEXTMENU()
ON_WM_CLOSE()
ON_WM_SIZE()
- ON_WM_VSCROLL()
+ ON_WM_VSCROLL()
ON_WM_ERASEBKGND()
- ON_WM_PAINT()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -269,22 +268,6 @@
}
/**
- * @brief Invalidate rect of old visible area indicator to restore background correctly
- */
-void CLocationView::OnPaint()
-{
- if (m_visibleTop != -1 && m_visibleBottom != -1)
- {
- CRect rc;
- GetClientRect(rc);
- rc.top = m_visibleTop;
- rc.bottom = m_visibleBottom;
- InvalidateRect(rc);
- }
- CView::OnPaint();
-}
-
-/**
* @brief Draw maps of files.
*
* Draws maps of differences in files. Difference list is walked and
@@ -303,8 +286,11 @@
if (!m_view[MERGE_VIEW_LEFT]->IsInitialized()) return;
- CMemDC dc(pDC);
+ CRect rc;
+ GetClientRect(&rc);
+ CMemDC dc(pDC, &rc);
+
COLORREF cr0 = CLR_NONE; // Left side color
COLORREF cr1 = CLR_NONE; // Right side color
COLORREF crt = CLR_NONE; // Text color
@@ -436,6 +422,10 @@
if (m_displayMovedBlocks != DISPLAY_MOVED_NONE)
DrawConnectLines(&dc);
+ if (m_pSavedBackgroundBitmap)
+ delete m_pSavedBackgroundBitmap;
+ m_pSavedBackgroundBitmap = CopyRectToBitmap(&dc, rc);
+
// Since we have invalidated locationbar there is no previous
// arearect to remove
m_visibleTop = -1;
@@ -802,18 +792,6 @@
(static_cast<double>(nBottomLine * m_lineInPix)));
int nRightCoord = rc.Width() - INDICATOR_MARGIN;
- // Visible area was not changed
- if (m_visibleTop == nTopCoord && m_visibleBottom == nBottomCoord)
- return;
-
- // Clear previous visible rect
- if (m_visibleTop != -1 && m_visibleBottom != -1 && m_pSavedBackgroundBitmap)
- {
- DrawBitmap(pClientDC, 2, m_visibleTop, m_pSavedBackgroundBitmap);
- delete m_pSavedBackgroundBitmap;
- m_pSavedBackgroundBitmap = NULL;
- }
-
double xbarBottom = min(nbLines / m_pixInLines + Y_OFFSET, rc.Height() - Y_OFFSET);
int barBottom = (int)xbarBottom;
// Make sure bottom coord is in bar range
@@ -839,9 +817,7 @@
CBitmap *pDarkenedBitmap = GetDarkenedBitmap(pClientDC, pBitmap);
DrawBitmap(pClientDC, rcVisibleArea.left, rcVisibleArea.top, pDarkenedBitmap);
delete pDarkenedBitmap;
- if (m_pSavedBackgroundBitmap)
- delete m_pSavedBackgroundBitmap;
- m_pSavedBackgroundBitmap = pBitmap;
+ delete pBitmap;
}
/**
@@ -854,9 +830,24 @@
{
if (m_bDrawn)
{
- CDC *pDC = GetDC();
- DrawVisibleAreaRect(pDC, nTopLine, nBottomLine);
- ReleaseDC(pDC);
+ int nTopCoord = static_cast<int>(Y_OFFSET +
+ (static_cast<double>(nTopLine * m_lineInPix)));
+ int nBottomCoord = static_cast<int>(Y_OFFSET +
+ (static_cast<double>(nBottomLine * m_lineInPix)));
+ if (m_visibleTop != nTopCoord || m_visibleBottom != nBottomCoord)
+ {
+ // Visible area was changed
+ CDC *pDC = GetDC();
+ if (m_pSavedBackgroundBitmap)
+ {
+ CMemDC dc(pDC);
+ // Clear previous visible rect
+ DrawBitmap(&dc, 0, 0, m_pSavedBackgroundBitmap);
+
+ DrawVisibleAreaRect(&dc, nTopLine, nBottomLine);
+ }
+ ReleaseDC(pDC);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-07-02 09:08:55
|
Revision: 5550
http://winmerge.svn.sourceforge.net/winmerge/?rev=5550&view=rev
Author: kimmov
Date: 2008-07-02 02:08:49 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
PATCH: [ 2007426 ] Chinese Simplified translation for trunk, all in one
Submitted by xmpdhml
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/WinMerge.iss
trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc
trunk/Src/Languages/ChineseSimplified.po
Added Paths:
-----------
trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-07-01 21:36:33 UTC (rev 5549)
+++ trunk/Docs/Users/ChangeLog.txt 2008-07-02 09:08:49 UTC (rev 5550)
@@ -9,6 +9,8 @@
Reduce executable sizes (#2003203)
BugFix: Possible crash when enabling line filter (#2004160)
BugFix: Location Pane flickers when scrolling (#1938177, #2005031)
+ Translation updates:
+ - Chinese Traditional (#2007426)
WinMerge 2.9.1.4 - 2008-06-24 (r5518)
Use PCRE regular expressions in the editor (#1991259)
Added: trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt
===================================================================
--- trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt (rev 0)
+++ trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt 2008-07-02 09:08:49 UTC (rev 5550)
@@ -0,0 +1,49 @@
+WINMERGE
+
+WinMerge \xCA\xC7һ\xBF\xEE\xD3\xC3\xD2Զ\xD4\xCEļ\xFE\xBD\xF8\xD0жԱ\xC8\xD2Լ\xB0\xBAϲ\xA2\xA3\xAC\xBF\xC9\xD2\xD4\xD4\xCB\xD0\xD0\xD4\xDA\xCB\xF9\xD3\xD0\xC1\xF7\xD0е\xC4
+Windowsƽ̨\xC9ϵĿ\xAAԴ\xC8\xED\xBC\xFE\xA1\xA3\xD3\xD0Щ\xB9\xA6\xC4\xDC\xD0\xE8Ҫ\xB6\xEE\xCDⰲװ\xD7\xE9\xBC\xFE\xA1\xA3
+
+\xD7\xEE\xD0µ\xC4 WinMerge \xB0汾\xD2Լ\xB0\xC6\xE4\xCB\xFC\xCF\xE0\xB9\xD8\xD0\xC5Ϣ\xBF\xC9\xD2Դ\xD3 http://winmerge.org \xB5õ\xBD\xA1\xA3
+
+WinMerge \xBF\xEC\xCB\xD9\xC8\xEB\xC3ţ\xBA
+\xC7\xEB\xD4Ķ\xC1\xD4\xDA\xCF\xDF\xCAֲ\xE1\xB5ġ\xB0Quick-start\xA1\xB1\xD5½\xDA\xC0\xB4\xC1˽Ⲣ\xBF\xAAʼ\xBC\xB4\xD3\xC3 WinMerge \xA3\xBA
+http://www.winmerge.org/2.8/manual/quickstart.html
+
+HTML \xCAֲ
+\xD3û\xA7\xCAֲ\xE1\xBF\xC9\xD2Դ\xD3 http://www.winmerge.org/2.8/manual/ \xB5õ\xBD\xA3\xACҲ\xBF\xC9\xD2\xD4\xD4ڰ\xB2װʱѡ\xD4\xF1
+\xB0\xB2װ\xB5\xBD\xB1\xBE\xB5أ\xAC\xBB\xF2\xD5\xDFҲ\xBF\xC9\xD2Ե\xA5\xB6\xC0\xB4\xD3 http://www.winmerge.org/ \xCF\xC2\xD4ء\xA3(\xB2μ\xFB\xCEĵ\xB5)
+
+ѹ\xCB\xF5\xB0\xFC֧\xB3֣\xBA
+WinMerge ʹ\xD3\xC3 7-Zip ֧\xB3\xD6ѹ\xCB\xF5\xB0\xFC\xA1\xA37-Zip (http://www.7-zip.org) \xCA\xC7һ\xB8\xF6\xBF\xAAԴ\xB5Ĵ\xF2
+\xB0\xFC\xC8\xED\xBC\xFE\xA1\xA3Ҫ\xB0\xB2װѹ\xCB\xF5\xB0\xFC֧\xB3֣\xAC\xC7\xEB\xB4\xD3 http://www.winmerge.org/ \xCF\xC2\xD4\xD8 7-Zip \xB2\xE5\xBC\xFE\xB0\xB2װ
+\xB3\xCC\xD0\xF2\xA1\xA3
+
+\xB0\xB2װѹ\xCB\xF5\xB0\xFC֧\xB3֣\xBA
+\xCDƼ\xF6\xB0\xB2װ 7-Zip Ӧ\xD3ó\xCC\xD0\xF2\xA1\xA3\xC8\xE7\xB9\xFB\xB2\xBB\xC4ܰ\xB2װ\xB5Ļ\xB0\xA3\xAC7-Zip \xB2\xE5\xBC\xFE\xB0\xB2װ\xB3\xCC\xD0\xF2ֻ\xBBᰲװ\xC4\xC7Щ֧
+\xB3\xD6ѹ\xCB\xF5\xB0\xFC\xCB\xF9\xB1\xD8\xD0\xE8\xB5\xC4\xCEļ\xFE\xA1\xA3\xC7\xEBע\xD2\xE2\xD5\xE2\xD6\xD6\xC7\xE9\xBF\xF6\xCF½\xAB*\xB2\xBB\xC4\xDC*\xB5\xA5\xB6\xC0ʹ\xD3\xC3 7-Zip\xA3\xACֻ\xC4\xDC\xD4\xDA
+WinMerge \xD6\xD0֧\xB3\xD6ѹ\xCB\xF5\xB0\xFC\xA1\xA3
+
+\xBDű\xBE֧\xB3֣\xBA
+\xC8\xE7\xB9\xFB\xC4\xFA\xCF\xEBʹ\xD3ýű\xBE\xA3\xAC\xC4\xFA\xD0\xE8Ҫ\xB0\xB2װ Windows Script Host\xA1\xA3\xC8\xE7\xB9\xFB\xC4\xFA\xD3\xF6\xB5\xBD\xC8κι\xD8\xD3ڽű\xBE\xB5\xC4
+\xCE\xCA\xCC⣬\xC7\xEB\xB7\xC3\xCE\xCA
+http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
+\xD2\xD4ȷ\xB6\xA8\xC4\xFA\xB5\xC4 Windows Script Host \xD2Ѿ\xAD\xC6\xA2\xC7\xD2\xD4\xCB\xD0\xD0\xD5\xFD\xB3\xA3\xA1\xA3
+
+֧\xB3֣\xBA
+\xBF\xAA\xB7\xA2\xC8\xCBԱ\xBB\xE1\xD4\xDA Sourceforge.net \xB5\xC4 WinMerge \xB0\xE6\xC3\xE6\xBBش\xF0\xCE\xCA\xCC⣬\xB5\xD8ַ\xC8\xE7\xCF£\xBA
+http://sourceforge.net/forum/?group_id=13216
+
+Bug \xBA\xA6\xC4\xDC\xD0\xE8\xC7\xF3\xA3\xBA
+Bug \xBAͶ\xD4\xD0¹\xA6\xC4ܵĽ\xA8\xD2\xE9Ӧ\xB5\xB1\xCCύ\xB5\xBD sourceforge.net \xB5\xC4 bug \xBA\xCD RFE trackers \xC9ϡ\xA3
+
+Bug tracker:
+http://sourceforge.net/tracker/?group_id=13216&atid=113216
+\xB5\xB1\xC4\xFA\xCCύ bug ʱ\xA3\xAC\xC7\xEB\xB8\xE6\xCB\xDF\xCE\xD2\xC3\xC7 WinMerge \xB5İ汾\xBAţ\xA1
+WinMerge 2.2.0 \xBC\xB0\xD2\xD4\xC9ϰ汾\xBF\xC9\xD2\xD4ѡ\xD4\xF1\xB2˵\xA5\xA1\xB0\xB0\xEF\xD6\xFA/\xC5\xE4\xD6á\xB1\xC0\xB4\xCA\xE4\xB3\xF6\xC5\xE4\xD6\xC3\xD0\xC5Ϣ\xA1\xA3\xC7\xEB\xB0\xD1\xD5\xE2\xB8\xF6
+\xCEļ\xFE\xD2Ը\xBD\xBC\xFE\xB5ķ\xBDʽ\xBCӵ\xBD bug \xB1\xA8\xB8\xE6\xD6У\xAC\xCB\xFC\xB0\xFC\xC0\xA8\xD0\xED\xB6\xE0\xB6\xD4\xD3ڿ\xAA\xB7\xA2\xC8\xCBԱ\xB7dz\xA3\xD3\xD0\xD3õ\xC4\xD0\xC5Ϣ\xA1\xA3
+
+RFE (\xB9\xA6\xC4\xDC) tracker:
+http://sourceforge.net/tracker/?group_id=13216&atid=363216
+
+
+- WinMerge \xBF\xAA\xB7\xA2\xC8\xCBԱ
Property changes on: trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-07-01 21:36:33 UTC (rev 5549)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-07-02 09:08:49 UTC (rev 5550)
@@ -70,7 +70,7 @@
AboutSetupNote=
; *** Buttons
-TranslatorNote=\xBC\xF2\xCC\xE5\xD6\xD0\xCEķ\xAD\xD2\xEB\xD3ɰ\xD7\xC5\xF4֧\xB3֣\xA8...@si...\xA3\xA9
+TranslatorNote=\xBC\xF2\xCC\xE5\xD6\xD0\xCEķ\xAD\xD2\xEB\xD3\xC9 Сè\xC6˵ú\xDC\xC2\xF4\xC1\xA6(xm...@gm...) ֧\xB3\xD6
ButtonBack=< \xC9\xCFһ\xB2\xBD(&B)
ButtonNext=\xCF\xC2һ\xB2\xBD(&N) >
ButtonInstall=\xB0\xB2װ(&I)
@@ -314,22 +314,22 @@
CompanyName=Thingamahoochie Software
;Types
-TypicalInstallation=Typical Installation
-FullInstallation=Full Installation
-CompactInstallation=Compact Installation
-CustomInstallation=Custom Installation
+TypicalInstallation=\xB5\xE4\xD0Ͱ\xB2װ
+FullInstallation=ȫ\xB2\xBF\xB0\xB2װ
+CompactInstallation=\xD7\xEEС\xB0\xB2װ
+CustomInstallation=\xD7Զ\xA8\xD2尲װ
;Components
-AppCoreFiles=WinMerge Core Files
-ApplicationRuntimes=Application Runtimes
-Filters=Filters
-Plugins=Plugins
+AppCoreFiles=WinMerge \xBA\xCB\xD0\xC4\xCEļ\xFE
+ApplicationRuntimes=Ӧ\xD3ó\xCC\xD0\xF2
+Filters=\xB9\xFD\xC2\xCB\xC6\xF7
+Plugins=\xB2\xE5\xBC\xFE
;Localization Components
-Languages=Languages
+Languages=\xD3\xEF\xD1\xD4
BulgarianLanguage=Bulgarian menus and dialogs
CatalanLanguage=Catalan menus and dialogs
-ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs
+ChineseSimplifiedLanguage=\xBC\xF2\xCC\xE5\xD6\xD0\xCEIJ˵\xA5\xBAͶԻ\xB0\xBF\xF2
ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs
CroatianLanguage=Croatian menus and dialogs
CzechLanguage=Czech menus and dialogs
@@ -356,22 +356,22 @@
UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
-ExplorerContextMenu=&Enable Explorer context menu integration
-IntegrateTortoiseCVS=Integrate with &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
-IntegrateClearCase=Integrate with Rational &ClearCase
-IntegrateDelphi4=Borland Delphi &4 Binary File Support
-UpdatingCommonControls=Updating the System's Common Controls
+ExplorerContextMenu=\xBC\xAF\xB3ɵ\xBD\xD7\xCAԴ\xB9\xDC\xC0\xED\xC6\xF7\xD3Ҽ\xFC\xB2˵\xA5(&E)
+IntegrateTortoiseCVS=\xBC\xAF\xB3ɵ\xBD &TortoiseCVS
+IntegrateTortoiseSVN=\xBC\xAF\xB3ɵ\xBD T&ortoiseSVN
+IntegrateClearCase=\xBC\xAF\xB3ɵ\xBD Rational &ClearCase
+IntegrateDelphi4=֧\xB3\xD6 Borland Delphi &4 \xB6\xFE\xBD\xF8\xD6\xC6\xCEļ\xFE
+UpdatingCommonControls=\xB8\xFC\xD0\xC2ϵͳ\xB5\xC4 Common Controls
;Icon Labels
-ReadMe=Read Me
-UsersGuide=User's Guide
-UpdatingCommonControls=Updating the System's Common Controls
-ViewStartMenuFolder=&View the WinMerge Start Menu Folder
-PluginsText=Plugins
+ReadMe=˵\xC3\xF7\xCEļ\xFE
+UsersGuide=\xD3û\xA7\xCAֲ\xE1
+UpdatingCommonControls=\xB8\xFC\xD0\xC2ϵͳ\xB5\xC4 Common Controls
+ViewStartMenuFolder=\xB2鿴 WinMerge \xBF\xAAʼ\xB2˵\xA5\xCEļ\xFE\xBC\xD0(&V)
+PluginsText=\xB2\xE5\xBC\xFE
;Code Dialogs
-DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder?
+DeletePreviousStartMenu=\xB0\xB2װ\xB3\xCC\xD0\xF2\xBC\xEC\xB2\xC4\xFA\xD0\xC4\xC1˿\xAAʼ\xB2˵\xA5\xB5\xC4λ\xD6\xC3(\xB4\xD3"%s"\xB5\xBD"%s")\xA3\xAC\xCAǷ\xF1Ҫɾ\xB3\xFD֮ǰ\xB5Ŀ\xAAʼ\xB2˵\xA5\xCEļ\xFE\xBCУ\xBF
; Project file description
-ProjectFileDesc=WinMerge Project file
+ProjectFileDesc=WinMerge \xB9\xA4\xB3\xCC\xCEļ\xFE
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-07-01 21:36:33 UTC (rev 5549)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-07-02 09:08:49 UTC (rev 5550)
@@ -117,7 +117,7 @@
;Localizations:
Name: Bulgarian; MessagesFile: Languages\Bulgarian.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt
Name: Catalan; MessagesFile: Languages\Catalan.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Catalan.txt
-Name: Chinese_Simplified; MessagesFile: Languages\Chinese_Simplified.isl
+Name: Chinese_Simplified; MessagesFile: Languages\Chinese_Simplified.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-ChineseSimplified.txt
Name: Chinese_Traditional; MessagesFile: Languages\Chinese_Traditional.isl
Name: Croatian; MessagesFile: Languages\Croatian.isl
Name: Czech; MessagesFile: Languages\Czech.isl
Modified: trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc 2008-07-01 21:36:33 UTC (rev 5549)
+++ trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc 2008-07-02 09:08:49 UTC (rev 5550)
@@ -32,14 +32,14 @@
BEGIN
IDS_PROJNAME "ShellExtension"
IDS_CONTEXT_MENU "WinMerge"
- IDS_CONTEXT_HELP "Open with WinMerge"
- IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Compare"
- IDS_COMPARE_ELLIPSIS "Compare..."
- IDS_COMPARE_TO "Compare To"
- IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
- IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
- IDS_RESELECT_FIRST "Re-select First"
+ IDS_CONTEXT_HELP "\xD3\xC3 WinMerge \xB4\xF2\xBF\xAA"
+ IDS_CONTEXT_HELP_MANYITEMS "\xC7벻Ҫѡ\xD6г\xAC\xB9\xFD2\xB8\xF6\xCF\xEEĿ"
+ IDS_COMPARE "\xB6Ա\xC8"
+ IDS_COMPARE_ELLIPSIS "\xB6Ա\xC8..."
+ IDS_COMPARE_TO "\xBA\xCD\xC1\xED\xCD\xE2һ\xB8\xF6\xB6Ա\xC8"
+ IDS_HELP_SAVETHIS "\xB1\xA3\xB4\xE6\xD5\xE2\xB8\xF6·\xBE\xB6\xA1\xA3ѡ\xD4\xF1\xC1\xED\xCD\xE2һ\xB8\xF6·\xBE\xB6\xD3\xEB֮\xBD\xF8\xD0жԱȡ\xA3"
+ IDS_HELP_COMPARESAVED "\xD3뱣\xB4\xE6\xB5\xC4·\xBE\xB6(%1)\xBD\xF8\xD0жԱ\xC8"
+ IDS_RESELECT_FIRST "\xD6\xD8\xD0\xC2ѡ\xD4\xF1\xB5\xDAһ\xB8\xF6·\xBE\xB6"
END
#endif // Chinese (Traditional) resources
Modified: trunk/Src/Languages/ChineseSimplified.po
===================================================================
--- trunk/Src/Languages/ChineseSimplified.po 2008-07-01 21:36:33 UTC (rev 5549)
+++ trunk/Src/Languages/ChineseSimplified.po 2008-07-02 09:08:49 UTC (rev 5550)
@@ -14,7 +14,7 @@
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
-"Last-Translator: \n"
+"Last-Translator: xmpdhml <xm...@us...>\n"
"Language-Team: ChineseSimplified <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP936\n"
@@ -41,18 +41,18 @@
#: Merge.rc:99
#, c-format
msgid "C&opy to Right"
-msgstr "\xB8\xB4\xD6Ƶ\xBD\xD3Ҳ\xE0(&R)"
+msgstr "\xB8\xB4\xD6Ƶ\xBD\xD3Ҳ\xE0(&O)"
#: Merge.rc:73
#: Merge.rc:100
#, c-format
msgid "Cop&y to Left"
-msgstr "\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&L)"
+msgstr "\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&Y)"
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "ѡ\xD6\xD0\xD0\xD0\xD6в\xBBͬ(&S)"
+msgstr "ѡ\xD6\xD0\xD0\xD0\xC4ڲ\xBBͬ(&S)"
#: Merge.rc:77
#, c-format
@@ -68,7 +68,7 @@
#: Merge.rc:102
#, c-format
msgid "Cu&t"
-msgstr "\xBC\xF4\xC7\xD0(&U)"
+msgstr "\xBC\xF4\xC7\xD0(&T)"
#: Merge.rc:81
#: Merge.rc:103
@@ -139,14 +139,14 @@
#: Merge.rc:114
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "\xB4\xE5ͻ\xCEļ\xFE(&E)..."
#: Merge.rc:116
#: Merge.rc:194
#: Merge.rc:308
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr "\xB4\xA4\xB3\xCC...\tCtrl+J"
+msgstr "\xB4\xA4\xB3\xCC(J)...\tCtrl+J"
#: Merge.rc:117
#: Merge.rc:195
@@ -270,7 +270,7 @@
#: Merge.rc:439
#, c-format
msgid "&Generate Patch..."
-msgstr "\xC9\xFA\xB3\xC9 Patch(&G)..."
+msgstr "\xC9\xFA\xB3ɲ\xB9\xB6\xA1(&G)..."
#: Merge.rc:148
#: Merge.rc:262
@@ -340,7 +340,7 @@
#: Merge.rc:463
#, c-format
msgid "Cl&ose"
-msgstr "\xB9ر\xD5"
+msgstr "\xB9ر\xD5(&O)"
#: Merge.rc:165
#: Merge.rc:279
@@ -361,21 +361,21 @@
#: Merge.rc:468
#, c-format
msgid "Tile &Horizontally"
-msgstr "ˮƽ\xB2\xA2\xC5\xC5(&H)"
+msgstr "ˮƽƽ\xC6\xCC(&H)"
#: Merge.rc:170
#: Merge.rc:284
#: Merge.rc:469
#, c-format
msgid "Tile &Vertically"
-msgstr "\xB4\xB9ֱ\xB2\xA2\xC5\xC5(&V)"
+msgstr "\xB4\xB9ֱƽ\xC6\xCC(&V)"
#: Merge.rc:171
#: Merge.rc:285
#: Merge.rc:470
#, c-format
msgid "&Cascade"
-msgstr "\xD6ص\xFE(&C)"
+msgstr "\xB2\xE3\xB5\xFE(&C)"
#: Merge.rc:173
#: Merge.rc:287
@@ -390,28 +390,28 @@
#: Merge.rc:474
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&WinMerge\xB0\xEF\xD6\xFA\tF1"
#: Merge.rc:177
#: Merge.rc:291
#: Merge.rc:476
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "\xB7\xA2\xD0\xD0˵\xC3\xF7(&E)"
#: Merge.rc:178
#: Merge.rc:292
#: Merge.rc:477
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "\xB7\xAD\xD2\xEB(&T)"
#: Merge.rc:179
#: Merge.rc:293
#: Merge.rc:478
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "\xC5\xE4\xD6\xC3(&O)"
#: Merge.rc:180
#: Merge.rc:294
@@ -425,7 +425,7 @@
#: Merge.rc:481
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "&GNU General Public License"
#: Merge.rc:183
#: Merge.rc:297
@@ -485,7 +485,7 @@
#: Merge.rc:217
#, c-format
msgid "S&how Binary Files"
-msgstr "\xCF\xD4ʾ\xB6\xFE\xBD\xF8\xD6\xC6\xCF\xEEĿ(&H)"
+msgstr "\xCF\xD4ʾ\xB6\xFE\xBD\xF8\xD6\xC6\xCEļ\xFE(&H)"
#: Merge.rc:219
#, c-format
@@ -547,7 +547,7 @@
#: Merge.rc:425
#, c-format
msgid "&Last Difference\tAlt+End"
-msgstr "\xD7\xEE\xBA\xF3һ\xB4\xA6\xB2\xBBͬ(&D)\tAlt+End"
+msgstr "\xD7\xEE\xBA\xF3һ\xB4\xA6\xB2\xBBͬ(&L)\tAlt+End"
#: Merge.rc:250
#: Merge.rc:427
@@ -559,7 +559,7 @@
#: Merge.rc:428
#, c-format
msgid "Copy to L&eft\tAlt+Left"
-msgstr "\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&L)\tAlt+Left"
+msgstr "\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&E)\tAlt+Left"
#: Merge.rc:253
#, c-format
@@ -618,7 +618,7 @@
#: Merge.rc:325
#, c-format
msgid "Print Previe&w"
-msgstr "\xB4\xF2ӡԤ\xC0\xC0"
+msgstr "\xB4\xF2ӡԤ\xC0\xC0(&W)"
#: Merge.rc:330
#, c-format
@@ -628,27 +628,27 @@
#: Merge.rc:332
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:333
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:334
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:337
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "\xBAϲ\xA2ģʽ\tF9"
+msgstr "\xBAϲ\xA2ģʽ(&M)\tF9"
#: Merge.rc:339
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "\xCEļ\xFE\xB1\xE0\xC2\xEB(&F)..."
#: Merge.rc:345
#, c-format
@@ -663,7 +663,7 @@
#: Merge.rc:348
#, c-format
msgid "Cu&t\tCtrl+X"
-msgstr "\xBC\xF4\xC7\xD0(&U)\tCtrl+X"
+msgstr "\xBC\xF4\xC7\xD0(&T)\tCtrl+X"
#: Merge.rc:349
#, c-format
@@ -678,7 +678,7 @@
#: Merge.rc:352
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "ѡ\xD6\xD0\xD0\xD0\xD6в\xBBͬ(&D)\tF4"
+msgstr "ѡ\xD6\xD0\xD0\xD0\xC4ڲ\xBBͬ(&D)\tF4"
#: Merge.rc:355
#, c-format
@@ -724,7 +724,7 @@
#: Merge.rc:371
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr "\xCF\xC2һ\xB8\xF6(&N\tF2"
+msgstr "\xCF\xC2һ\xB8\xF6(&N)\tF2"
#: Merge.rc:372
#, c-format
@@ -744,23 +744,23 @@
#: Merge.rc:383
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "\xCB\xF5\xB7\xC5(&Z)"
#: Merge.rc:385
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "\xB7Ŵ\xF3(&I)\tCtrl++"
#: Merge.rc:386
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "\xCB\xF5С(&O)\tCtrl+-"
#. Zoom to normal
#: Merge.rc:387
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "\xD5\xFD\xB3\xA3\xB4\xF3С(&N)\tCtrl+*"
#: Merge.rc:389
#, c-format
@@ -770,7 +770,7 @@
#: Merge.rc:394
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "\xCB\xB8\xF1(&L)"
#: Merge.rc:395
#, c-format
@@ -780,7 +780,7 @@
#: Merge.rc:396
#, c-format
msgid "Vie&w Line Differences"
-msgstr "\xCF\xD4ʾ\xD0\xD0\xD6в\xBBͬ(&W)"
+msgstr "\xCF\xD4ʾ\xD0\xD0\xC4ڲ\xBBͬ(&W)"
#: Merge.rc:397
#, c-format
@@ -830,7 +830,7 @@
#: Merge.rc:434
#, c-format
msgid "Cop&y All to Left"
-msgstr "ȫ\xB2\xBF\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&E)"
+msgstr "ȫ\xB2\xBF\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&Y)"
#: Merge.rc:449
#, c-format
@@ -845,12 +845,12 @@
#: Merge.rc:491
#, c-format
msgid "Co&mpare Special"
-msgstr ""
+msgstr "\xCC\xD8\xCA\xE2\xB6Ա\xC8(&M)"
#: Merge.rc:493
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:498
#, c-format
@@ -959,7 +959,7 @@
#: Merge.rc:538
#, c-format
msgid "&Zip"
-msgstr ""
+msgstr "&Zip"
#: Merge.rc:540
#, c-format
@@ -1039,7 +1039,7 @@
#: Merge.rc:656
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(Private Build)"
#: Merge.rc:657
#, c-format
@@ -1070,7 +1070,7 @@
#: Merge.rc:662
#, c-format
msgid "Contributors"
-msgstr ""
+msgstr "\xB9\xB1\xCF\xD7\xD5\xDF"
#: Merge.rc:669
#, c-format
@@ -1123,7 +1123,7 @@
#: Merge.rc:689
#, c-format
msgid "&Select..."
-msgstr "ѡ\xD4\xF1..."
+msgstr "ѡ\xD4\xF1(&S)..."
#: Merge.rc:690
#: Merge.rc:1598
@@ -1168,7 +1168,7 @@
#: Merge.rc:703
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visual SourceSafe"
#: Merge.rc:708
#, c-format
@@ -1241,7 +1241,7 @@
#: Merge.rc:748
#, c-format
msgid "&Disable Splash Screen"
-msgstr "ͣ\xD3\xC3\xC6\xF4\xB6\xAF\xC6\xC1Ļ(&D)"
+msgstr "ͣ\xD3û\xB6ӭ\xC6\xC1Ļ(&D)"
#: Merge.rc:750
#, c-format
@@ -1251,22 +1251,22 @@
#: Merge.rc:752
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "\xD4ڡ\xB0\xB4\xB1\xB6Ի\xB0\xBF\xF2\xD6\xD0\xD7Զ\xAF\xD1\xE9֤·\xBE\xB6"
+msgstr "\xD4ڡ\xB0\xB4\xB1\xB6Ի\xB0\xBF\xF2\xD6\xD0\xD7Զ\xAF\xD1\xE9֤·\xBE\xB6(&A)"
#: Merge.rc:755
#, c-format
msgid "All&ow only one instance to run"
-msgstr "ֻ\xD4\xCA\xD0\xED\xD4\xCB\xD0\xD0һ\xB8\xF6ʵ\xC0\xFD(&A)"
+msgstr "ֻ\xD4\xCA\xD0\xED\xD4\xCB\xD0\xD0һ\xB8\xF6ʵ\xC0\xFD(&O)"
#: Merge.rc:757
#, c-format
msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "\xB5\xB1\xB9رն\xE0\xB8\xDAʱѯ\xCE\xCA\xCE\xD2(&K)"
#: Merge.rc:759
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "\xB6Ա\xC8ʱ\xB1\xA3\xB3\xD6\xCEļ\xFEʱ\xBC䲻\xB1\xE4(&P)"
#: Merge.rc:762
#, c-format
@@ -1342,7 +1342,7 @@
#: Merge.rc:805
#, c-format
msgid "D&on't wrap end of file"
-msgstr "\xB5\xBD\xCEļ\xFEβ\xBA\xF3\xB2\xBB\xD4ٴ\xD3ͷ\xB2\xE9\xD5\xD2(&O)"
+msgstr "\xD6\xC1\xCEļ\xFEĩβ\xB2\xBB\xD4ٴ\xD3ͷ\xCB\xD1\xCB\xF7(&O)"
#: Merge.rc:808
#, c-format
@@ -1409,7 +1409,7 @@
#: Merge.rc:2134
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rational ClearCase"
#: Merge.rc:855
#, c-format
@@ -1420,12 +1420,12 @@
#: Merge.rc:1172
#, c-format
msgid "Comments"
-msgstr "\xC5\xFAע"
+msgstr "\xB1\xB8ע"
#: Merge.rc:863
#, c-format
msgid "CheckIn after checkout"
-msgstr ""
+msgstr "ǩ\xB3\xF6\xBA\xF3\xC1\xA2\xBC\xB4ǩ\xC8\xEB"
#: Merge.rc:869
#, c-format
@@ -1514,12 +1514,12 @@
#: Merge.rc:946
#, c-format
msgid "Word Difference:"
-msgstr "\xB4\xCA\xD3ﲻͬ:"
+msgstr "\xB5\xA5\xB4ʲ\xBBͬ:"
#: Merge.rc:953
#, c-format
msgid "Selected Word Diff:"
-msgstr "ѡ\xD6еĴ\xCA\xD3ﲻͬ:"
+msgstr "ѡ\xD6еĵ\xA5\xB4ʲ\xBBͬ:"
#: Merge.rc:960
#: Merge.rc:1046
@@ -1535,7 +1535,7 @@
#: Merge.rc:1551
#, c-format
msgid "Dialog"
-msgstr ""
+msgstr "\xB6Ի\xB0\xBF\xF2"
#: Merge.rc:976
#: Merge.rc:1905
@@ -1581,22 +1581,22 @@
#: Merge.rc:993
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "\xE4\xAF\xC0\xC0(&R)..."
#: Merge.rc:994
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "\xC1\xD9ʱ\xCEļ\xFE\xBC\xD0"
#: Merge.rc:995
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "ϵͳ\xC1\xD9ʱ\xCEļ\xFE\xBC\xD0(&Y)"
#: Merge.rc:997
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "\xD7Զ\xA8\xD2\xE5\xCEļ\xFE\xBC\xD0(&U):"
#: Merge.rc:1000
#: Merge.rc:1016
@@ -1607,7 +1607,7 @@
#: Merge.rc:1006
#, c-format
msgid "Patch Generator"
-msgstr "Patch\xC9\xFA\xB3\xC9\xC6\xF7"
+msgstr "\xB2\xB9\xB6\xA1\xC9\xFA\xB3\xC9\xC6\xF7"
#: Merge.rc:1009
#, c-format
@@ -1662,12 +1662,12 @@
#: Merge.rc:1034
#, c-format
msgid "I&gnore changes"
-msgstr "\xBA\xF6\xC2Ա仯(G)"
+msgstr "\xBA\xF6\xC2Կհ\xCD\xD6Ʊ\xED\xB7\xFB\xB8\xFC\xB8\xC4(G)"
#: Merge.rc:1036
#, c-format
msgid "Ig&nore all"
-msgstr "\xBA\xF6\xC2\xD4\xCB\xF9\xD3\xD0(&N)"
+msgstr "\xBA\xF6\xC2\xD4\xCB\xF9\xD3пհ\xCD\xD6Ʊ\xED\xB7\xFB(&N)"
#: Merge.rc:1038
#, c-format
@@ -1697,12 +1697,12 @@
#: Merge.rc:1072
#, c-format
msgid "Move &Up"
-msgstr ""
+msgstr "\xC9\xCF\xD2\xC6(&U)"
#: Merge.rc:1073
#, c-format
msgid "Move &Down"
-msgstr ""
+msgstr "\xCF\xC2\xD2\xC6(&D)"
#: Merge.rc:1083
#, c-format
@@ -1804,17 +1804,17 @@
#: Merge.rc:1147
#, c-format
msgid "&Compare"
-msgstr "\xB6Աȿհ\xCD\xD6Ʊ\xED\xB7\xFB(&W)"
+msgstr "\xB6Աȿհ\xCD\xD6Ʊ\xED\xB7\xFB(&C)"
#: Merge.rc:1149
#, c-format
msgid "&Ignore change"
-msgstr "\xBA\xF6\xC2Կհ\xCD\xD6Ʊ\xED\xB7\xFB\xB8\xFC\xB8\xC4(&H)"
+msgstr "\xBA\xF6\xC2Կհ\xCD\xD6Ʊ\xED\xB7\xFB\xB8\xFC\xB8\xC4(&I)"
#: Merge.rc:1151
#, c-format
msgid "I&gnore all"
-msgstr "\xBA\xF6\xC2\xD4\xCB\xF9\xD3пհ\xCD\xD6Ʊ\xED\xB7\xFB(&A)"
+msgstr "\xBA\xF6\xC2\xD4\xCB\xF9\xD3пհ\xCD\xD6Ʊ\xED\xB7\xFB(&G)"
#: Merge.rc:1153
#, c-format
@@ -1824,12 +1824,12 @@
#: Merge.rc:1155
#, c-format
msgid "Ignore &case"
-msgstr "\xBA\xF6\xC2Դ\xF3Сд(&E)"
+msgstr "\xBA\xF6\xC2Դ\xF3Сд(&C)"
#: Merge.rc:1157
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "\xBA\xF6\xC2Ի\xBB\xD0з\xFB\xB2\xEE\xD2\xEC(Windows/Unix/Mac)(&R)"
#: Merge.rc:1160
#, c-format
@@ -1844,7 +1844,7 @@
#: Merge.rc:1164
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr "\xBA\xF6\xC2Բ\xBB\xD7\xE33\xC3\xEB\xB5\xC4ʱ\xBC\xE4\xB2\xEE\xB1\xF0"
+msgstr "\xBA\xF6\xC2Բ\xBB\xD7\xE33\xC3\xEB\xB5\xC4ʱ\xBC\xE4\xB2\xEE\xB1\xF0(&O)"
#: Merge.rc:1167
#, c-format
@@ -1875,12 +1875,12 @@
#: Merge.rc:1185
#, c-format
msgid "&Automatic rescan"
-msgstr "\xD7Զ\xAF\xD6\xD8\xD0\xC2ɨ\xC3\xE8(&R)"
+msgstr "\xD7Զ\xAF\xD6\xD8\xD0\xC2ɨ\xC3\xE8(&A)"
#: Merge.rc:1187
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "\xB1\xA3\xB3\xD6ԭʼ\xB5Ļ\xBB\xD0з\xFB(&P)"
+msgstr "\xB1\xA3\xB3ֻ\xBB\xD0з\xFB\xB2\xBB\xB1\xE4(&P)"
#: Merge.rc:1189
#, c-format
@@ -1895,22 +1895,22 @@
#: Merge.rc:1193
#, c-format
msgid "&Insert Tabs"
-msgstr "\xB2\xE5\xC8\xEB\xD6Ʊ\xED\xB7\xFB(&T)"
+msgstr "\xB2\xE5\xC8\xEB\xD6Ʊ\xED\xB7\xFB(&I)"
#: Merge.rc:1195
#, c-format
msgid "Insert &Spaces"
-msgstr "\xB2\xE5\xC8\xEB\xBFո\xF1(&N)"
+msgstr "\xB2\xE5\xC8\xEB\xBFո\xF1(&S)"
#: Merge.rc:1197
#, c-format
msgid "Line Difference Coloring"
-msgstr "\xD0\xD0\xD6жԱ\xC8"
+msgstr "\xD0\xD0\xC4ڶԱ\xC8"
#: Merge.rc:1199
#, c-format
msgid "View line differences"
-msgstr "\xCF\xD4ʾ\xD0\xD0\xD6в\xBBͬ"
+msgstr "\xCF\xD4ʾ\xD0\xD0\xC4ڲ\xBBͬ"
#: Merge.rc:1201
#, c-format
@@ -2092,7 +2092,7 @@
#: Merge.rc:1299
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
#: Merge.rc:1302
#, c-format
@@ -2128,7 +2128,7 @@
#: Merge.rc:1313
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr ""
+msgstr "\xB2\xBB\xD4\xD9\xCF\xD4ʾ\xB4\xCB\xCF\xFBϢ(&M)\xA1\xA3\n(\xC4\xFA\xBF\xC9\xD2\xD4\xD4ڰ\xEF\xD6\xFA\xB2˵\xA5\xC0\xEF\xB5\xF7\xB3\xF6\xB4\xCB\xCF\xFBϢ\xA1\xA3)"
#: Merge.rc:1317
#, c-format
@@ -2295,7 +2295,7 @@
#: Merge.rc:1455
#, c-format
msgid "&Detect archive type from file signature"
-msgstr "\xD2\xC0\xBE\xDD\xCA\xF0\xC3\xFB\xBC\xEC\xB2\xE2\xCEļ\xFE\xC0\xE0\xD0\xCD(&D)"
+msgstr "\xB8\xF9\xBE\xDD\xC4\xDA\xC8ݼ\xEC\xB2\xE2\xCEļ\xFE\xC0\xE0\xD0\xCD(&D)"
#: Merge.rc:1463
#, c-format
@@ -2369,7 +2369,7 @@
#: Merge.rc:1515
#, c-format
msgid "(Affects)"
-msgstr ""
+msgstr "(Ӱ\xCF\xEC)"
#: Merge.rc:1516
#, c-format
@@ -2385,7 +2385,7 @@
#: Merge.rc:1522
#, c-format
msgid "..."
-msgstr ""
+msgstr "..."
#: Merge.rc:1520
#, c-format
@@ -2512,7 +2512,7 @@
#: Merge.rc:1615
#, c-format
msgid "&Original file's folder"
-msgstr "ԭʼ\xCEļ\xFE\xCB\xF9\xD4\xDA\xCEļ\xFE\xBC\xD0(&O)"
+msgstr "ԭ\xCEļ\xFE\xCB\xF9\xD4\xDA\xCEļ\xFE\xBC\xD0(&O)"
#: Merge.rc:1617
#, c-format
@@ -2584,32 +2584,32 @@
#: Merge.rc:1706
#, c-format
msgid "EXT"
-msgstr ""
+msgstr "EXT"
#: Merge.rc:1707
#, c-format
msgid "CAP"
-msgstr ""
+msgstr "CAP"
#: Merge.rc:1708
#, c-format
msgid "NUM"
-msgstr ""
+msgstr "NUM"
#: Merge.rc:1709
#, c-format
msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
#: Merge.rc:1710
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "OVR"
#: Merge.rc:1711
#, c-format
msgid "REC"
-msgstr ""
+msgstr "REC"
#: Merge.rc:1717
#, c-format
@@ -2653,7 +2653,7 @@
"Save the active document with a new name\n"
"Save As"
msgstr ""
-"\xD2\xD4һ\xB8\xF6\xD0\xC2\xC3\xFB\xB3Ʊ\xA3\xB4浱ǰ\xD6\xD0\xCEļ\xFE\n"
+"\xD2\xD4һ\xB8\xF6\xD0\xC2\xC3\xFB\xB3Ʊ\xA3\xB4浱ǰ\xB5\xC4\xCEļ\xFE\n"
"\xC1\xED\xB4\xE6Ϊ"
#: Merge.rc:1722
@@ -2801,7 +2801,9 @@
msgid ""
"Arrange windows so they overlap\n"
"Cascade Windows"
-msgstr "\xC5\xC5\xC1д\xB0\xBF\xDA\xC8\xC3\xCB\xFC\xC3DZ˴˸\xB2\xB8\xC7n\xD6ص\xFE\xB4\xB0\xBF\xDA"
+msgstr ""
+"\xC5\xC5\xC1д\xB0\xBF\xDA\xC8\xC3\xCB\xFC\xC3DZ˴˸\xB2\xB8\xC7\n"
+"\xB2\xE3\xB5\xFE\xB4\xB0\xBF\xDA"
#: Merge.rc:1782
#, fuzzy, c-format
@@ -2809,8 +2811,8 @@
"Arrange windows as non-overlapping tiles horizontally\n"
"Tile Windows Horizontally"
msgstr ""
-"\xB7Ǹ\xB2\xB8ǵ\xC4\xC5\xC5\xC1д\xB0\xBF\xDA\n"
-"\xB2\xA2\xC1д\xB0\xBF\xDA"
+"\xBD\xAB\xB4\xB0\xBFں\xE1\xCF\xF2ƽ\xC6\xCC\xCF\xD4ʾ\n"
+"\xBA\xE1\xCF\xF2ƽ\xC6̴\xB0\xBF\xDA"
#: Merge.rc:1783
#, fuzzy, c-format
@@ -2818,8 +2820,8 @@
"Arrange windows as non-overlapping tiles vertically\n"
"Tile Windows Vertically"
msgstr ""
-"\xB7Ǹ\xB2\xB8ǵ\xC4\xC5\xC5\xC1д\xB0\xBF\xDA\n"
-"\xB2\xA2\xC1д\xB0\xBF\xDA"
+"\xBD\xAB\xB4\xB0\xBF\xDA\xD7\xDD\xCF\xF2ƽ\xC6\xCC\xCF\xD4ʾ\n"
+"\xD7\xDD\xCF\xF2ƽ\xC6̴\xB0\xBF\xDA"
#: Merge.rc:1789
#, c-format
@@ -2932,7 +2934,7 @@
#: Merge.rc:1806
#, c-format
msgid "Automatically resize panes\nLock Panes"
-msgstr ""
+msgstr "\xD7Զ\xAF\xB5\xF7\xD5\xFB\xB4\xB0\xB8\xF1\xB4\xF3С\n\xCB\xB8\xF1"
#: Merge.rc:1812
#, c-format
@@ -2977,7 +2979,7 @@
#: Merge.rc:1824
#, c-format
msgid "Activate Task List"
-msgstr "\xC6\xF4\xD3ù\xA4\xD7\xF7\xC7嵥"
+msgstr "\xC6\xF4\xD3\xC3\xC8\xCE\xCE\xF1\xC7嵥"
#: Merge.rc:1825
#, c-format
@@ -2996,17 +2998,17 @@
#: Merge.rc:1838
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
-msgstr ""
+msgstr "\nnFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge \xCEļ\xFE\xB6Ա\xC8"
#: Merge.rc:1839
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr ""
+msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
#: Merge.rc:1846
#, c-format
msgid "Preserve original EOL chars"
-msgstr "\xB1\xA3\xC1\xF4ԭʼ\xB5Ļ\xBB\xD0з\xFB"
+msgstr "\xB1\xA3\xB3ֻ\xBB\xD0з\xFB\xB2\xBB\xB1\xE4"
#: Merge.rc:1853
#, c-format
@@ -3022,12 +3024,12 @@
#: Merge.rc:1866
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr ""
+msgstr "\xBF\xAA\xB7\xA2\xC8\xCBԱ:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1867
#, 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 ""
+msgstr "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."
#: Merge.rc:1873
#, c-format
@@ -3147,7 +3149,7 @@
#: Merge.rc:1927
#, c-format
msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
#: Merge.rc:1933
#, c-format
@@ -3234,22 +3236,22 @@
#: Merge.rc:1965
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:1966
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:1967
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:1968
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:1974
#, c-format
@@ -3294,7 +3296,7 @@
#: Merge.rc:1987
#, c-format
msgid "[F] "
-msgstr ""
+msgstr "[F] "
#: Merge.rc:1988
#, c-format
@@ -3419,12 +3421,12 @@
#: Merge.rc:2026
#, c-format
msgid "Theirs File"
-msgstr ""
+msgstr "\xCB\xFB\xC3ǵ\xC4\xCEļ\xFE"
#: Merge.rc:2027
#, c-format
msgid "Mine File"
-msgstr ""
+msgstr "\xCEҵ\xC4\xCEļ\xFE"
#: Merge.rc:2033
#, c-format
@@ -3593,12 +3595,12 @@
#: Merge.rc:2084
#, c-format
msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "\xBD\xE2\xCE\xF6\xB3\xE5ͻ\xCEļ\xFEʱʧ\xB0\xDC"
#: Merge.rc:2085
#, c-format
msgid "The file\n%1\nis not a conflict file."
-msgstr ""
+msgstr "\xCEļ\xFE\n%1\n\xB2\xBB\xCA\xC7һ\xB8\xF6\xB3\xE5ͻ\xCEļ\xFE"
#: M...
[truncated message content] |
|
From: <ki...@us...> - 2008-07-03 19:40:03
|
Revision: 5554
http://winmerge.svn.sourceforge.net/winmerge/?rev=5554&view=rev
Author: kimmov
Date: 2008-07-03 12:39:57 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
PATCH: [ 2008581 ] Convert paths using system codepage
Patch idea from rarevisitor
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/DiffFileData.cpp
trunk/Src/DiffWrapper.cpp
trunk/Src/DirCmpReport.cpp
trunk/Src/Merge.vcproj
Added Paths:
-----------
trunk/Src/AnsiConvert.cpp
trunk/Src/AnsiConvert.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-07-03 19:05:36 UTC (rev 5553)
+++ trunk/Docs/Users/ChangeLog.txt 2008-07-03 19:39:57 UTC (rev 5554)
@@ -10,6 +10,7 @@
Release Notes update (#2007673)
BugFix: Possible crash when enabling line filter (#2004160)
BugFix: Location Pane flickers when scrolling (#1938177, #2005031)
+ BugFix: Use system codepage for paths (#1979429, #2008581)
Translation updates:
- Chinese Traditional (#2007426)
Added: trunk/Src/AnsiConvert.cpp
===================================================================
--- trunk/Src/AnsiConvert.cpp (rev 0)
+++ trunk/Src/AnsiConvert.cpp 2008-07-03 19:39:57 UTC (rev 5554)
@@ -0,0 +1,44 @@
+/**
+ * @file AnsiConvert.cpp
+ *
+ * @brief Implementation file for Unicode to ANSI conversion routines.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+
+/**
+ * @brief Convert from Unicode to Ansi using system codepage.
+ * This function converts Unicode string to ansi string using system codepage.
+ * This conversion function should be used when converting strings containing
+ * paths. As paths are handled by the system and are not file content.
+ * @param [in] str String to convert.
+ * @return Ansi string.
+ */
+LPCSTR ansiconvert_SystemCP(LPCTSTR str)
+{
+ // These lines replace USES_CONVERSION macro
+ int _convert = 0;
+ UINT _acp = GetACP();
+ LPCWSTR _lpw = 0;
+ LPCSTR _lpa = 0;
+
+ return T2CA(str);
+}
+
+/**
+ * @brief Convert from Unicode to Ansi using thread codepage.
+ * This function converts Unicode string to ansi string using thread codepage.
+ * Thread codepage is practically the codepage WinMerge is using internally.
+ * @param [in] str String to convert.
+ * @return Ansi string.
+ */
+LPCSTR ansiconvert_ThreadCP(LPCTSTR str)
+{
+ USES_CONVERSION;
+ return T2CA(str);
+}
+
+
Property changes on: trunk/Src/AnsiConvert.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Src/AnsiConvert.h
===================================================================
--- trunk/Src/AnsiConvert.h (rev 0)
+++ trunk/Src/AnsiConvert.h 2008-07-03 19:39:57 UTC (rev 5554)
@@ -0,0 +1,16 @@
+/**
+ * @file AnsiConvert.h
+ *
+ * @brief Declaration file for routines to convert from Unicode to ANSI.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _ANSI_CONVERST_H_
+#define _ANSI_CONVERT_H_
+
+LPCSTR ansiconvert_SystemCP(LPCTSTR str);
+LPCSTR ansiconvert_ThreadCP(LPCTSTR str);
+
+#endif // _ANSI_CONVERT_H_
Property changes on: trunk/Src/AnsiConvert.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp 2008-07-03 19:05:36 UTC (rev 5553)
+++ trunk/Src/DiffFileData.cpp 2008-07-03 19:39:57 UTC (rev 5554)
@@ -19,6 +19,7 @@
#include "common/unicoder.h"
#include "codepage_detect.h"
#include <shlwapi.h>
+#include "AnsiConvert.h"
#include "DiffFileData.h"
@@ -83,11 +84,10 @@
for (int i=0; i<2; ++i)
{
// Fill in 8-bit versions of names for diffutils (WinMerge doesn't use these)
- USES_CONVERSION;
// Actual paths are m_FileLocation[i].filepath
// but these are often temporary files
// Displayable (original) paths are m_sDisplayFilepath[i]
- m_inf[i].name = strdup(T2CA(m_sDisplayFilepath[i]));
+ m_inf[i].name = strdup(ansiconvert_SystemCP(m_sDisplayFilepath[i]));
if (m_inf[i].name == NULL)
return false;
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2008-07-03 19:05:36 UTC (rev 5553)
+++ trunk/Src/DiffWrapper.cpp 2008-07-03 19:39:57 UTC (rev 5554)
@@ -44,6 +44,7 @@
#include "FolderCmp.h"
#include "FilterCommentsManager.h"
#include "Environment.h"
+#include "AnsiConvert.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -662,12 +663,10 @@
replace_char(&*filepath2.begin(), '/', '\\');
BOOL bRet = TRUE;
- USES_CONVERSION;
String strFile1Temp = filepath1;
String strFile2Temp = filepath2;
m_options.SetToDiffUtils();
- //SwapToInternalSettings();
if (m_bUseDiffList)
m_nDiffs = m_pDiffList->GetSize();
@@ -1190,7 +1189,6 @@
*/
void CDiffWrapper::WritePatchFile(struct change * script, file_data * inf)
{
- USES_CONVERSION;
file_data inf_patch[2] = {0};
CopyMemory(&inf_patch, inf, sizeof(file_data) * 2);
@@ -1204,8 +1202,8 @@
path2 = m_s2File;
replace_char(&*path1.begin(), '\\', '/');
replace_char(&*path2.begin(), '\\', '/');
- inf_patch[0].name = strdup(T2CA(path1.c_str()));
- inf_patch[1].name = strdup(T2CA(path2.c_str()));
+ inf_patch[0].name = strdup(ansiconvert_SystemCP(path1.c_str()));
+ inf_patch[1].name = strdup(ansiconvert_SystemCP(path2.c_str()));
outfile = NULL;
if (!m_sPatchFile.IsEmpty())
Modified: trunk/Src/DirCmpReport.cpp
===================================================================
--- trunk/Src/DirCmpReport.cpp 2008-07-03 19:05:36 UTC (rev 5553)
+++ trunk/Src/DirCmpReport.cpp 2008-07-03 19:39:57 UTC (rev 5554)
@@ -16,6 +16,7 @@
#include "coretools.h"
#include "WaitStatusCursor.h"
#include "paths.h"
+#include "AnsiConvert.h"
#include <afxadv.h>
UINT CF_HTML = RegisterClipboardFormat(_T("HTML Format"));
@@ -222,8 +223,7 @@
*/
void DirCmpReport::WriteString(LPCTSTR pszText)
{
- USES_CONVERSION;
- LPCSTR pchOctets = T2A((LPTSTR)pszText);
+ LPCSTR pchOctets = ansiconvert_ThreadCP((LPTSTR)pszText);
size_t cchAhead = strlen(pchOctets);
while (LPCSTR pchAhead = (LPCSTR)memchr(pchOctets, '\n', cchAhead))
{
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-07-03 19:05:36 UTC (rev 5553)
+++ trunk/Src/Merge.vcproj 2008-07-03 19:39:57 UTC (rev 5554)
@@ -388,6 +388,42 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\AnsiConvert.cpp">
+ <FileConfiguration
+ Name="UnicodeRelease|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>
+ </FileConfiguration> </File>
+ <File
RelativePath="BCMenu.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -5934,6 +5970,9 @@
RelativePath="AboutDlg.h">
</File>
<File
+ RelativePath=".\AnsiConvert.h">
+ </File>
+ <File
RelativePath="BCMenu.h">
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-07-07 07:55:27
|
Revision: 5571
http://winmerge.svn.sourceforge.net/winmerge/?rev=5571&view=rev
Author: kimmov
Date: 2008-07-07 00:55:24 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
PATCH: [ 2011602 ] Add ShellExtension for drives (root folders)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/ShellExtension/WinMergeShell.rgs
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-07-07 07:39:18 UTC (rev 5570)
+++ trunk/Docs/Users/ChangeLog.txt 2008-07-07 07:55:24 UTC (rev 5571)
@@ -5,8 +5,9 @@
WinMerge 2.11.1.1
Manual: Introduction update (#2011365)
+ Add ShellExtension menu for drive letters (root folders) (#2011602)
-WinMerge 2.10.x (R_210) branch created (r5561)
+WinMerge 2.10.x (R2_10) branch created (r5561)
WinMerge 2.9.1.5 - 2008-07-04 (r5560)
Manual: Copy editing (#2000322, #2005418)
Modified: trunk/ShellExtension/WinMergeShell.rgs
===================================================================
--- trunk/ShellExtension/WinMergeShell.rgs 2008-07-07 07:39:18 UTC (rev 5570)
+++ trunk/ShellExtension/WinMergeShell.rgs 2008-07-07 07:55:24 UTC (rev 5571)
@@ -58,4 +58,15 @@
}
}
}
-}
\ No newline at end of file
+
+ NoRemove Drive
+ {
+ NoRemove ShellEx
+ {
+ NoRemove ContextMenuHandlers
+ {
+ ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
+ }
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-07-07 11:13:50
|
Revision: 5574
http://winmerge.svn.sourceforge.net/winmerge/?rev=5574&view=rev
Author: kimmov
Date: 2008-07-07 04:13:47 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
Move installer localization instructions document to Docs/Developers where all other documents are.
Added Paths:
-----------
trunk/Docs/Developers/InnoSetup_Localization_Instructions.txt
Removed Paths:
-------------
trunk/Installer/InnoSetup/Languages/Localization Instructions.txt
Copied: trunk/Docs/Developers/InnoSetup_Localization_Instructions.txt (from rev 5565, trunk/Installer/InnoSetup/Languages/Localization Instructions.txt)
===================================================================
--- trunk/Docs/Developers/InnoSetup_Localization_Instructions.txt (rev 0)
+++ trunk/Docs/Developers/InnoSetup_Localization_Instructions.txt 2008-07-07 11:13:47 UTC (rev 5574)
@@ -0,0 +1,57 @@
+The .ISL or Inno Setup Language files files are in .ini format, which means you have a line that looks like this to translate:
+SomeLabelName=I'm a label's text translate me
+
+If a particular line doesn't already contain a period in it please don't add one, that means Inno Setup will add a period automatically. If you add a period to that line, then there will be two of them.
+
+The other type of text you should never modify are variables and they come in two forms:
+%1, %2, %3, etc...
+
+or
+
+[name], [mb], [name/ver], etc...
+
+The remainder of this file contains specific instructions for each localized language. Please look for your language within this file. If it's not listed here or you have any other questions please let Seier Blackburn know at MyP...@Ya....
+
+The following languages do not need translating outside of the [CustomMessages] section at the bottom of the .ISL file for your language:
+Bulgarian, Chinese (Simplified), Chinese (Traditional), Czech, Danish, Dutch, French, German, Italian, Korean, Norwegian, Polish, Russian, Slovak, and Swedish. Catalan, Portuguese (Brazilian), and Spanish need to be translated more carefully. Please see the sections to translate below.
+
+Once you've translated your file. Please commit your changes to the CVS (/InnoSetup/Languages/YourLanguage.iss) and submit it as a patch assigning it to Seier and titling the patch as "Inno Setup Localization: SomeLanguage".
+
+The good news is not only will your translation be helpful to our project, but countless other installers will now speak your language. I will be submitting all these translations to the Inno Setup project for inclusion :). If you want to proof read the rest of the translated text you're more than welcome to. Also please feel free to add your name to the top of the file:
+
+;Translated by: John Doe
+
+If you translate some text and forget what it looked like in English, don't fret just have a look at English.isl and search for the same constant. Where XYZ is the name of the constant:
+XYZ=English Text
+
+Please download and install Translator: http://www2.arnes.si/~sopjsimo/translator.html. Once you have installed it run the application opening English.isl on the left and your native language on the right.
+
+Here are three languages that have specific lines in addition to the custom messages section that need to be translated. In case you were wondering the [CustomMessages] section is for text specific to our installer like "Filters" for example. All other sections are for text used by the installer itself, like the text that appears on the buttons [Cancel], [Next], [Finish], etc...
+
+
+[Catalan]
+File=Catalan.isl
+LinesToTranslate=4
+Line1=SelectStartMenuFolderLabel3
+Line2=SelectDirLabel3
+Line3=SelectDirBrowseLabel
+Line4=SelectStartMenuFolderBrowseLabel
+
+[Brazilian/Portuguese]
+File=Brazilian_Portuguese.isl
+LinesToTranslate=4
+Line1=SelectStartMenuFolderLabel3
+Line2=SelectDirLabel3
+Line3=SelectDirBrowseLabel
+Line4=SelectStartMenuFolderBrowseLabel
+
+[Spanish]
+File=Spanish.isl
+LinesToTranslate=4
+Line1=SelectStartMenuFolderLabel3
+Line2=SelectDirLabel3
+Line3=SelectDirBrowseLabel
+Line4=SelectStartMenuFolderBrowseLabel
+
+Thanks for all your help,
+Seier Blackburn
Deleted: trunk/Installer/InnoSetup/Languages/Localization Instructions.txt
===================================================================
--- trunk/Installer/InnoSetup/Languages/Localization Instructions.txt 2008-07-07 11:05:48 UTC (rev 5573)
+++ trunk/Installer/InnoSetup/Languages/Localization Instructions.txt 2008-07-07 11:13:47 UTC (rev 5574)
@@ -1,57 +0,0 @@
-The .ISL or Inno Setup Language files files are in .ini format, which means you have a line that looks like this to translate:
-SomeLabelName=I'm a label's text translate me
-
-If a particular line doesn't already contain a period in it please don't add one, that means Inno Setup will add a period automatically. If you add a period to that line, then there will be two of them.
-
-The other type of text you should never modify are variables and they come in two forms:
-%1, %2, %3, etc...
-
-or
-
-[name], [mb], [name/ver], etc...
-
-The remainder of this file contains specific instructions for each localized language. Please look for your language within this file. If it's not listed here or you have any other questions please let Seier Blackburn know at MyP...@Ya....
-
-The following languages do not need translating outside of the [CustomMessages] section at the bottom of the .ISL file for your language:
-Bulgarian, Chinese (Simplified), Chinese (Traditional), Czech, Danish, Dutch, French, German, Italian, Korean, Norwegian, Polish, Russian, Slovak, and Swedish. Catalan, Portuguese (Brazilian), and Spanish need to be translated more carefully. Please see the sections to translate below.
-
-Once you've translated your file. Please commit your changes to the CVS (/InnoSetup/Languages/YourLanguage.iss) and submit it as a patch assigning it to Seier and titling the patch as "Inno Setup Localization: SomeLanguage".
-
-The good news is not only will your translation be helpful to our project, but countless other installers will now speak your language. I will be submitting all these translations to the Inno Setup project for inclusion :). If you want to proof read the rest of the translated text you're more than welcome to. Also please feel free to add your name to the top of the file:
-
-;Translated by: John Doe
-
-If you translate some text and forget what it looked like in English, don't fret just have a look at English.isl and search for the same constant. Where XYZ is the name of the constant:
-XYZ=English Text
-
-Please download and install Translator: http://www2.arnes.si/~sopjsimo/translator.html. Once you have installed it run the application opening English.isl on the left and your native language on the right.
-
-Here are three languages that have specific lines in addition to the custom messages section that need to be translated. In case you were wondering the [CustomMessages] section is for text specific to our installer like "Filters" for example. All other sections are for text used by the installer itself, like the text that appears on the buttons [Cancel], [Next], [Finish], etc...
-
-
-[Catalan]
-File=Catalan.isl
-LinesToTranslate=4
-Line1=SelectStartMenuFolderLabel3
-Line2=SelectDirLabel3
-Line3=SelectDirBrowseLabel
-Line4=SelectStartMenuFolderBrowseLabel
-
-[Brazilian/Portuguese]
-File=Brazilian_Portuguese.isl
-LinesToTranslate=4
-Line1=SelectStartMenuFolderLabel3
-Line2=SelectDirLabel3
-Line3=SelectDirBrowseLabel
-Line4=SelectStartMenuFolderBrowseLabel
-
-[Spanish]
-File=Spanish.isl
-LinesToTranslate=4
-Line1=SelectStartMenuFolderLabel3
-Line2=SelectDirLabel3
-Line3=SelectDirBrowseLabel
-Line4=SelectStartMenuFolderBrowseLabel
-
-Thanks for all your help,
-Seier Blackburn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
