Tools\Scripts\CheckTranslationStrings.cmd = Tools\Scripts\CheckTranslationStrings.cmd
Tools\Scripts\CheckTranslationStrings.ps1 = Tools\Scripts\CheckTranslationStrings.ps1
Tools\Scripts\CheckUnusedResources.vbs = Tools\Scripts\CheckUnusedResources.vbs
- Tools\Scripts\cleanup_backups.py = Tools\Scripts\cleanup_backups.py
Tools\Scripts\README.md = Tools\Scripts\README.md
- Tools\Scripts\tsvn_patch.py = Tools\Scripts\tsvn_patch.py
Tools\Scripts\UpdateTranslations.bat = Tools\Scripts\UpdateTranslations.bat
EndProjectSection
EndProject
Tools\Scripts\CheckTranslationStrings.cmd = Tools\Scripts\CheckTranslationStrings.cmd
Tools\Scripts\CheckTranslationStrings.ps1 = Tools\Scripts\CheckTranslationStrings.ps1
Tools\Scripts\CheckUnusedResources.vbs = Tools\Scripts\CheckUnusedResources.vbs
- Tools\Scripts\cleanup_backups.py = Tools\Scripts\cleanup_backups.py
Tools\Scripts\README.md = Tools\Scripts\README.md
- Tools\Scripts\tsvn_patch.py = Tools\Scripts\tsvn_patch.py
Tools\Scripts\UpdateTranslations.bat = Tools\Scripts\UpdateTranslations.bat
EndProjectSection
EndProject
Script for creating a list of (hopefully) unused resource IDs.
-tsvn_patch.py
--------------
- Script for cleaning up TortoiseSVN created patch files to use with GNU patch.
-
-```
- Usage: python tsvn_patch.py [-b] patchfile
- where:
- -b, --nobak skip creating a backup file of the original patch file
-```
-
-
UpdateTranslations.bat
----------------------
Batch file for updating PO template (.pot) file and merging changes to
pushd "../../Translations/WinMerge/"
cscript //nologo CreateMasterPotFile.vbs
echo.
-cscript //nologo UpdatePoFilesFromPotFile.vbs
+powershell -executionpolicy remotesigned -file UpdatePoFilesFromPotFile.ps1
popd
-@echo on
\ No newline at end of file
+@echo on
+++ /dev/null
-#############################################################################
-## License (GPLv2+):
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#############################################################################
-
-# Copyright (c) 2010 Kimmo Varis <kimmov@winmerge.org>
-
-# $Id$
-
-# A script for cleaning up Visual Studio backup files that get created when
-# solution/project files are updated to new version of VS.
-
-import getopt
-import os
-import shutil
-import sys
-
-# The version of the script
-scriptversion = 0.1
-
-def cleanupfolder(folder):
- reportfolder = os.path.join(folder, r'_UpgradeReport_Files')
- if os.path.exists(reportfolder):
- shutil.rmtree(reportfolder)
-
- logfile = r'UpgradeLog{0}.XML'
- logfile = os.path.join(folder, logfile.format(''))
- if os.path.exists(logfile):
- os.remove(logfile)
-
- index = 2;
- existed = True
- while existed == True:
- logfile = os.path.join(folder, logfile.format(index))
- if os.path.exists(logfile):
- os.remove(logfile)
- else:
- existed = False
- index += 1
-
-def usage():
- '''Print script usage information.'''
-
- print 'cleanup_backups.py - version ' + str(scriptversion)
- print 'Script to cleanup VS solution/project update backup/log files.'
- print 'Usage: cleanup_backups.py [-h] [path]'
- print 'Where:'
- print ' -h, --help Print this help.'
- print ' path folder where solution/project file is.'
- print 'For example: cleanup_backups.py src'
-
-def main(argv):
- rootfolder = ''
- if len(argv) > 0:
- opts, args = getopt.getopt(argv, 'h', ['help'])
-
- for opt, arg in opts:
- if opt in ('-h', '--help'):
- usage()
- sys.exit()
-
- if len(args) == 1:
- rel_path = args[0]
- rootfolder = os.path.abspath(rel_path)
-
- # If not root path given, use current folder as root path
- if rootfolder == '':
- rootfolder = os.getcwd()
-
- if not os.path.exists(rootfolder):
- print 'ERROR: Cannot find path: ' + rootfolder
- sys.exit()
-
- print 'Removing backups from folder: ' + rootfolder
- cleanupfolder(rootfolder)
-
-# MAIN #
-if __name__ == "__main__":
- main(sys.argv[1:])
+++ /dev/null
-#
-# The MIT License
-# Copyright (c) 2008 Kimmo Varis
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# $Id$
-
-# This script removes additional data that TortoiseSVN adds to the patch
-# files. After running this script for TortoiseSVN patch the patch file
-# can be applied with GNU patch.
-#
-# This patch removes:
-# - Index -lines containing filename to patch
-# - Index-line following separator line
-# - Revision numbers from actual patch filename lines
-#
-# Original patch file is kept with .bak filename extension.
-
-import getopt
-import os
-import shutil
-import sys
-
-def process_patch(filename, backup):
- '''Process one patch file. Create a bak file from original file and
- temp file for processing. After successfully processing rename temp
- file to original file.
-
- filename: patch file's filename
- backup: create a backup file?
- return: True if conversion succeeded, False otherwise
- '''
-
- outfile = filename + '.tmp'
- bakfile = filename + '.bak'
-
- if not os.path.exists(filename):
- print 'Patch file ' + filename + ' not found!'
- return False
-
- if backup == True:
- shutil.copyfile(filename, bakfile)
-
- ret = clean_patch(filename, outfile)
- if ret == True:
- shutil.move(outfile, filename)
- else:
- os.remove(outfile)
- if os.path.exists(bakfile):
- os.remove(bakfile)
- return False
- return True
-
-def clean_patch(infile, outfile):
- '''Remove TortoiseSVN specifics from a patch file.
-
- infile: filename of patch file to convert
- outfile: new file to create for converted file
- return: True if the conversion succeeds, False otherwise
- '''
-
- try:
- f = open(infile, 'r')
- except IOError, (errno, strerror):
- print 'Cannot open file ' + infile + ' for reading'
- print 'Error: ' + strerror
- return False
-
- try:
- f2 = open(outfile, 'w')
- except IOError, (errno, strerror):
- print 'Cannot open file ' + outfile + ' for writing'
- print 'Error: ' + strerror
- return False
-
- sepline = False # next line *should* be a separator line
- infolines = 0 # GNU patch filename lines
- linenum = 0
- parse_err = False
- for line in f:
- linenum += 1
-
- # TSVN patches have additional 'Index' -lines with following
- # separator line. We remove these additional lines
- if line.startswith('Index: '):
- sepline = True
- continue
- if sepline == True:
- if not line.startswith('===='):
- print 'Unexpected line found in line ', linenum
- print 'This is not a TSVN patch file?'
- parse_err = True
- break
- sepline = False
- infolines = 2
- continue
-
- # Remove revision number (in parentheses) from filename lines
- # E.g. line
- # --- filename.c (revision 323)
- # is stripped to:
- # --- filename.c
- if infolines > 0:
- if line.startswith('---') or line.startswith('+++'):
- index = line.rfind('(')
- index2 = line.rfind(')')
- if index != -1 and index2 != -1:
- line = line[:index].rstrip() + line[index2 + 1:]
- infolines -= 1
- else:
- print 'Unexpected line found in line ', linenum
- print 'This is not a TSVN patch file?'
- parse_err = True
- break
-
- f2.write(line)
-
- f.close()
- f2.close()
-
- if parse_err == True:
- return False
- return True
-
-def usage():
- print 'TortoiseSVN patch file cleanup script.'
- print 'This script removes TSVN specific additions from patch files so that'
- print 'GNU patch can apply them.'
- print 'Usage: tsvn_patch [-b] filename'
- print ' where:'
- print ' -b, --nobak Do not create a backup file of original file'
-
-def main(argv):
- filename = ""
- createbaks = True
- if len(argv) > 0:
- opts, args = getopt.getopt(argv, "hb", [ "help", "nobak"])
-
- for opt, arg in opts:
- if opt in ("-h", "--help"):
- usage()
- sys.exit()
- if opt in ("-b", "--nobak"):
- createbaks = False
-
- if len(args) == 1:
- filename = args[0]
- else:
- usage()
- sys.exit()
- else:
- usage()
- sys.exit()
-
- ret = False
- if len(filename) > 0:
- ret = process_patch(filename, createbaks)
-
- if ret == True:
- print 'Patch file ' + filename + ' converted successfully!'
-
-### MAIN ###
-if __name__ == "__main__":
- main(sys.argv[1:])
+++ /dev/null
-diff2winmerge.exe & diff2winmergeU.exe
-
-diff2winmerge(U) is a utility for invoking WinMerge with gnu diff style options
-
-
-
-For example, running
-
-diff2winmerge path/WinMerge.exe -bi /minimize /noninteractive
-
-will invoke WinMerge in this fashion:
-
-path/WinMerge.exe /ignorews:1 /ignorecase:1 /minimize /noninteractive
-
-
-Note that only gnu diff options are translated; other options (such as "/minimize"
-above) are passed directly through to WinMerge.
-
-
-
-diff2winmergeU.exe is compiled as UCS-2 (Unicode), for use with WinMergeU.exe.
-
+++ /dev/null
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by diff2winmerge.rc
-//
-#define IDS_HELLO 1
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
+++ /dev/null
-// stdafx.cpp : source file that includes just the standard includes
-// diff2winmerge.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
+++ /dev/null
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#if !defined(AFX_STDAFX_H__E05C29F9_84F3_492A_8F6E_A5A9F0F2334B__INCLUDED_)
-#define AFX_STDAFX_H__E05C29F9_84F3_492A_8F6E_A5A9F0F2334B__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include <iostream>
-
-// TODO: reference additional headers your program requires here
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__E05C29F9_84F3_492A_8F6E_A5A9F0F2334B__INCLUDED_)
+++ /dev/null
-// diff2winmerge.cpp : Defines the entry point for the console application.
-//
-
-#include "stdafx.h"
-#include "diff2winmerge.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-// Local functions
-
-static int ProcessAndCall(int argc, TCHAR* argv[]);
-static HANDLE RunIt(LPCTSTR szProgram, LPCTSTR szArgs, BOOL bMinimized=TRUE, BOOL bNewConsole=FALSE);
-
-/////////////////////////////////////////////////////////////////////////////
-// The one and only application object
-
-CWinApp theApp;
-
-using namespace std;
-
-
-int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
-{
-
- int nRetCode = 0;
-
- // initialize MFC and print and error on failure
- if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
- {
- // TODO: change error code to suit your needs
- cerr << _T("Fatal Error: MFC initialization failed") << endl;
- return -1;
- }
- try {
-
- return ProcessAndCall(argc, argv);
-
- } catch(CException * pExc) {
- pExc->ReportError();
- pExc->Delete();
- }
- return -1;
-}
-
-static LPCTSTR argmap[] = {
- _T("i"), _T("--ignore-case"), _T("/ignorecase:1")
- // -E --ignore-tab-expansion unavailable in WinMerge
- , _T("b"), _T("--ignore-space-change"), _T("/ignorews:1")
- , _T("w"), _T("--ignore-all-space"), _T("/ignorews:2")
- , _T("B"), _T("--ignore-blank-lines"), _T("/ignoreblanklines:1")
- , _T("g"), _T("--ignore-line_terminators"), _T("/ignoreeol:1")
-};
-
-static bool
-isShortSwitch(const CString & arg)
-{
- return (arg.GetLength()>=1 && arg[0] == '-');
-}
-
-static bool
-isLongSwitch(const CString & arg)
-{
- return (arg.GetLength()>=2 && arg[0] == '-' && arg[1] == '-');
-}
-
-static void
-AppendArg(CString &argline, LPCTSTR newarg)
-{
- if (!argline.IsEmpty())
- argline += _T(" ");
- argline += newarg;
-}
-
-static int
-ProcessAndCall(int argc, TCHAR* argv[])
-{
- if (argc<2) return -1;
- LPCTSTR target = argv[1];
-
- CString argline;
-
- for (int i=2; i<argc; ++i)
- {
- CString arg = argv[i];
- if (isShortSwitch(arg))
- {
- for (int x=1; x<arg.GetLength(); ++x)
- {
- for (int j=0; j<sizeof(argmap)/sizeof(argmap[0]); j += 3)
- {
- LPCTSTR shortSwitch = argmap[j];
- LPCTSTR winmergeSwitch = argmap[j+2];
- if (arg[x] == shortSwitch[0])
- {
- AppendArg(argline, winmergeSwitch);
- break;
- }
- }
- }
- }
- else if (isLongSwitch(arg))
- {
- for (int j=0; j<sizeof(argmap)/sizeof(argmap[0]); j += 3)
- {
- LPCTSTR longSwitch = argmap[j+1];
- LPCTSTR winmergeSwitch = argmap[j+2];
- if (arg == longSwitch)
- {
- AppendArg(argline, winmergeSwitch);
- break;
- }
- }
- }
- else
- {
- AppendArg(argline, arg);
- }
- }
-
- CString cmdline = target;
- if (!argline.IsEmpty())
- {
- cmdline += _T(" ");
- cmdline += argline;
- }
- HANDLE hprocess = RunIt(target, argline, FALSE);
-
- DWORD dwExitCode = -1;
- if (hprocess != INVALID_HANDLE_VALUE)
- {
- // Wait for WinMerge to complete
- WaitForSingleObject(hprocess, INFINITE );
- GetExitCodeProcess(hprocess, &dwExitCode );
- }
- return dwExitCode;
-}
-
-static TCHAR buffer[4096];
-
-/**
- * @brief Run specified commandline as new process
- */
-static HANDLE
-RunIt(LPCTSTR szProgram, LPCTSTR szArgs, BOOL bMinimized /*= TRUE*/, BOOL bNewConsole /*= FALSE*/)
-{
- STARTUPINFO si;
- PROCESS_INFORMATION procInfo;
-
- si.cb = sizeof(STARTUPINFO);
- si.lpReserved=NULL;
- si.lpDesktop = _T("");
- si.lpTitle = NULL;
- si.dwFlags = STARTF_USESHOWWINDOW;
- si.wShowWindow = (WORD)(SW_SHOW);
- si.cbReserved2 = 0;
- si.lpReserved2 = NULL;
-
- CString sArgs = szProgram;
- sArgs += _T(" ");
- sArgs += szArgs;
- LPTSTR szArgsBuff = sArgs.GetBuffer(0);
-
- _tcscpy(buffer, szProgram);
- if (szArgs)
- {
- _tcscat(buffer, _T(" "));
- _tcscat(buffer, szArgs);
- }
-
-
-
- if (!CreateProcess(NULL, buffer, NULL, NULL,
- FALSE, NORMAL_PRIORITY_CLASS|(bNewConsole? CREATE_NEW_CONSOLE:0),
- NULL, _T(".\\"), &si, &procInfo))
- {
- return INVALID_HANDLE_VALUE;
- }
-
- CloseHandle(procInfo.hThread);
- return procInfo.hProcess;
-}
-
+++ /dev/null
-# Microsoft Developer Studio Project File - Name="diff2winmerge" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=diff2winmerge - Win32 UnicodeDebug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "diff2winmerge.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "diff2winmerge.mak" CFG="diff2winmerge - Win32 UnicodeDebug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "diff2winmerge - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "diff2winmerge - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "diff2winmerge - Win32 UnicodeDebug" (based on "Win32 (x86) Console Application")
-!MESSAGE "diff2winmerge - Win32 UnicodeRelease" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "diff2winmerge - Win32 Release"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\BuildTmp\diff2winmerge\Release"
-# PROP Intermediate_Dir "..\BuildTmp\diff2winmerge\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x300a /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x300a /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\Build\MergeRelease/diff2winmerge.exe"
-
-!ELSEIF "$(CFG)" == "diff2winmerge - Win32 Debug"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\BuildTmp\diff2winmerge\MergeDebug"
-# PROP Intermediate_Dir "..\BuildTmp\diff2winmerge\MergeDebug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE RSC /l 0x300a /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x300a /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\Build\MergeDebug/diff2winmerge.exe" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "diff2winmerge - Win32 UnicodeDebug"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "diff2winmerge___Win32_UnicodeDebug"
-# PROP BASE Intermediate_Dir "diff2winmerge___Win32_UnicodeDebug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\BuildTmp\diff2winmerge\UnicodeDebug"
-# PROP Intermediate_Dir "..\BuildTmp\diff2winmerge\UnicodeDebug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE RSC /l 0x300a /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x300a /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\Build\MergeDebug/diff2winmerge.exe" /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/diff2winmergeU.exe" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "diff2winmerge - Win32 UnicodeRelease"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "diff2winmerge___Win32_UnicodeRelease"
-# PROP BASE Intermediate_Dir "diff2winmerge___Win32_UnicodeRelease"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\BuildTmp\diff2winmerge\UnicodeRelease"
-# PROP Intermediate_Dir "..\BuildTmp\diff2winmerge\UnicodeRelease"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x300a /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x300a /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\Build\MergeRelease/diff2winmerge.exe"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\Build\MergeUnicodeRelease/diff2winmergeU.exe"
-
-!ENDIF
-
-# Begin Target
-
-# Name "diff2winmerge - Win32 Release"
-# Name "diff2winmerge - Win32 Debug"
-# Name "diff2winmerge - Win32 UnicodeDebug"
-# Name "diff2winmerge - Win32 UnicodeRelease"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\diff2winmerge.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\diff2winmerge.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\diff2winmerge.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=.\Changes.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# End Target
-# End Project
+++ /dev/null
-
-#if !defined(AFX_DIFF2WINMERGE_H__F7BA3233_4792_45D8_90D1_0B8EF516D253__INCLUDED_)
-#define AFX_DIFF2WINMERGE_H__F7BA3233_4792_45D8_90D1_0B8EF516D253__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include "resource.h"
-
-
-#endif // !defined(AFX_DIFF2WINMERGE_H__F7BA3233_4792_45D8_90D1_0B8EF516D253__INCLUDED_)
+++ /dev/null
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Spanish (Modern) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
-#ifdef _WIN32
-LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_HELLO "Hello from MFC!"
-END
-
-#endif // Spanish (Modern) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Spanish (Castilian) (unknown sub-lang: 0xC) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESF)
-#ifdef _WIN32
-LANGUAGE LANG_SPANISH, 0xC
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,1,0
- PRODUCTVERSION 1,0,1,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "300a04b0"
- BEGIN
- VALUE "Comments", "WinMerge frontend\0"
- VALUE "CompanyName", "\0"
- VALUE "FileDescription", "diff2winmerge\0"
- VALUE "FileVersion", "1, 0, 1, 0\0"
- VALUE "InternalName", "diff2winmerge\0"
- VALUE "LegalCopyright", "Copyright © 2006\0"
- VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "diff2winmerge.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "diff2winmerge\0"
- VALUE "ProductVersion", "1, 0, 1, 0\0"
- VALUE "SpecialBuild", "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x300a, 1200
- END
-END
-
-#endif // !_MAC
-
-#endif // Spanish (Castilian) (unknown sub-lang: 0xC) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2021-02-01 23:09+0000\n"
+"POT-Creation-Date: 2021-02-07 10:33+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"