[Winmerge-svn] SF.net SVN: winmerge: [4964] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-01-27 11:50:56
|
Revision: 4964 http://winmerge.svn.sourceforge.net/winmerge/?rev=4964&view=rev Author: kimmov Date: 2008-01-27 03:50:51 -0800 (Sun, 27 Jan 2008) Log Message: ----------- PATCH: [ 1880423 ] Check if file is a conflict file before parsing Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/ConflictFileParser.cpp trunk/Src/ConflictFileParser.h trunk/Src/Languages/English.pot trunk/Src/MainFrm.cpp trunk/Src/Merge.cpp trunk/Src/Merge.rc trunk/Src/resource.h Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-01-27 04:38:29 UTC (rev 4963) +++ trunk/Docs/Users/ChangeLog.txt 2008-01-27 11:50:51 UTC (rev 4964) @@ -4,6 +4,7 @@ WinMerge 2.7.7.4 Detect (and read/write) UTF-8 files without BOM (#1879271) + Tell user that file is not a conflict file (#1880423) Translation updates: - Croatian (r4952) - Japanese (r4962) Modified: trunk/Src/ConflictFileParser.cpp =================================================================== --- trunk/Src/ConflictFileParser.cpp 2008-01-27 04:38:29 UTC (rev 4963) +++ trunk/Src/ConflictFileParser.cpp 2008-01-27 11:50:51 UTC (rev 4964) @@ -22,7 +22,7 @@ // ID line follows -- this is updated by SVN // $Id$ -// Modified from original code got from: +// Conflict file parsing method modified from original code got from: // TortoiseCVS - a Windows shell extension for easy version control // Copyright (C) 2000 - Francis Irving // <fr...@fl...> - January 2001 @@ -30,8 +30,10 @@ #include "StdAfx.h" #include "UnicodeString.h" #include "UniFile.h" +#include "ConflictFileParser.h" -// Note: keep these strings in "wrong" ord so we can resolve this file :) + +// Note: keep these strings in "wrong" order so we can resolve this file :) /** @brief String separating Mine and Theirs blocks. */ static const TCHAR Separator[] = _T("======="); /** @brief String ending Theirs block (and conflict). */ @@ -39,9 +41,54 @@ /** @brief String starting Mine block (and conflict). */ static const TCHAR MineBegin[] = _T("<<<<<<< "); -#include "ConflictFileParser.h" +/** + * @brief Check if the file is a conflict file. + * This function checks if the conflict file marker is found from given file. + * This is faster than trying to parse a file that is not conflict file. + * @param [in] conflictFileName Full path to file to check. + * @return true if given file is a conflict file, false otherwise. + */ +bool IsConflictFile(const String &conflictFileName) +{ + UniMemFile conflictFile; + BOOL startFound = FALSE; -// Parse a file + // open input file + BOOL success = conflictFile.OpenReadOnly(conflictFileName.c_str()); + + // Search for a conflict marker + BOOL linesToRead = TRUE; + while (linesToRead && startFound == FALSE) + { + CString cline; + bool lossy; + CString eol; + linesToRead = conflictFile.ReadString(cline, eol, &lossy); + String line = (LPCTSTR) cline; + + std::string::size_type pos; + pos = line.find(MineBegin); + if (pos == 0) + startFound = TRUE; + } + conflictFile.Close(); + + if (startFound) + return TRUE; + return FALSE; +} + +/** + * @brief Parse a conflict file to separate files. + * This function parses a conflict file to two different files which can be + * opened into WinMerge's file compare. + * @param [in] conflictFileName Full path to conflict file. + * @param [in] workingCopyFileName Full path for user's modified file in + * working copy/working folder. + * @param [in] newRevisionFileName Full path for revision control file. + * @param [out] bNestedConflicts returned as true if nested conflicts found. + * @return true if conflict file was successfully parsed, false otherwise. + */ bool ParseConflictFile(const String &conflictFileName, const String &workingCopyFileName, const String &newRevisionFileName, bool &bNestedConflicts) @@ -59,7 +106,6 @@ String revision = _T("none"); bNestedConflicts = false; - // open input file BOOL success = conflictFile.OpenReadOnly(conflictFileName.c_str()); Modified: trunk/Src/ConflictFileParser.h =================================================================== --- trunk/Src/ConflictFileParser.h 2008-01-27 04:38:29 UTC (rev 4963) +++ trunk/Src/ConflictFileParser.h 2008-01-27 11:50:51 UTC (rev 4964) @@ -22,14 +22,20 @@ // ID line follows -- this is updated by SVN // $Id$ -// Modified from original code got from: +// Conflict file parsing method modified from original code got from: // TortoiseCVS - a Windows shell extension for easy version control // Copyright (C) 2000 - Francis Irving // <fr...@fl...> - January 2001 +#ifndef _CONFLICT_FILE_PARSER_H_ +#define _CONFLICT_FILE_PARSER_H_ #include "UnicodeString.h" +bool IsConflictFile(const String &conflictFileName); + bool ParseConflictFile(const String &conflictFileName, const String &workingCopyFileName, const String &newRevisionFileName, bool &nestedConflicts); + +#endif // _CONFLICT_FILE_PARSER_H_ Modified: trunk/Src/Languages/English.pot =================================================================== --- trunk/Src/Languages/English.pot 2008-01-27 04:38:29 UTC (rev 4963) +++ trunk/Src/Languages/English.pot 2008-01-27 11:50:51 UTC (rev 4964) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-01-24 23:04+0000\n" +"POT-Creation-Date: 2008-01-27 13:49+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -710,7 +710,7 @@ msgstr "" #: Merge.rc:364 -#: Merge.rc:2863 +#: Merge.rc:2864 #, c-format msgid "< Empty >" msgstr "" @@ -1409,7 +1409,7 @@ msgstr "" #: Merge.rc:852 -#: Merge.rc:2118 +#: Merge.rc:2119 #, c-format msgid "Rational ClearCase" msgstr "" @@ -2282,7 +2282,7 @@ msgstr "" #: Merge.rc:1461 -#: Merge.rc:2260 +#: Merge.rc:2261 #, c-format msgid "Different" msgstr "" @@ -2314,7 +2314,7 @@ msgstr "" #: Merge.rc:1479 -#: Merge.rc:2255 +#: Merge.rc:2256 #, c-format msgid "Identical" msgstr "" @@ -3383,2701 +3383,2706 @@ msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2070 #, c-format -msgid "Save As" +msgid "The file\n%1\nis not a conflict file." msgstr "" #: Merge.rc:2076 #, c-format -msgid "Save changes to %1?" +msgid "Save As" msgstr "" #: Merge.rc:2077 #, c-format -msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" +msgid "Save changes to %1?" msgstr "" #: Merge.rc:2078 #, c-format -msgid "Error checking destination writeability" +msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" #: Merge.rc:2079 #, c-format +msgid "Error checking destination writeability" +msgstr "" + +#: Merge.rc:2080 +#, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2082 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2082 +#: Merge.rc:2083 #, c-format msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2083 +#: Merge.rc:2084 #, c-format msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2085 #, c-format msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2086 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2086 +#: Merge.rc:2087 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2087 +#: Merge.rc:2088 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again." msgstr "" -#: Merge.rc:2088 +#: Merge.rc:2089 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:2090 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2095 +#: Merge.rc:2096 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2102 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2103 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2104 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2104 +#: Merge.rc:2105 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2106 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2106 +#: Merge.rc:2107 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2107 +#: Merge.rc:2108 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2108 +#: Merge.rc:2109 #, c-format msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?" msgstr "" -#: Merge.rc:2109 +#: Merge.rc:2110 #, c-format msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. " msgstr "" -#: Merge.rc:2115 -#: Merge.rc:2899 +#: Merge.rc:2116 +#: Merge.rc:2900 #, c-format msgid "None" msgstr "" -#: Merge.rc:2116 +#: Merge.rc:2117 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2118 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2120 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2121 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2126 -#: Merge.rc:2128 -#, c-format -msgid "Copy selected item to named directory" -msgstr "" - #: Merge.rc:2127 #: Merge.rc:2129 #, c-format -msgid "Copy selected item to custom directory" +msgid "Copy selected item to named directory" msgstr "" +#: Merge.rc:2128 #: Merge.rc:2130 #, c-format -msgid "Delete selected item on left" +msgid "Copy selected item to custom directory" msgstr "" #: Merge.rc:2131 #, c-format -msgid "Delete selected item on right" +msgid "Delete selected item on left" msgstr "" #: Merge.rc:2132 #, c-format -msgid "Delete selected item(s) on both sides" +msgid "Delete selected item on right" msgstr "" #: Merge.rc:2133 #, c-format -msgid "Hide selected item(s) (on the fly filter)" +msgid "Delete selected item(s) on both sides" msgstr "" #: Merge.rc:2134 #, c-format -msgid "Rename selected item on both sides" +msgid "Hide selected item(s) (on the fly filter)" msgstr "" #: Merge.rc:2135 #, c-format -msgid "Right to Left (%1)" +msgid "Rename selected item on both sides" msgstr "" #: Merge.rc:2136 #, c-format -msgid "Left to Right (%1)" +msgid "Right to Left (%1)" msgstr "" #: Merge.rc:2137 #, c-format -msgid "Right to Left (%1 of %2)" +msgid "Left to Right (%1)" msgstr "" #: Merge.rc:2138 #, c-format -msgid "Left to Right (%1 of %2)" +msgid "Right to Left (%1 of %2)" msgstr "" #: Merge.rc:2139 -#: Merge.rc:2155 #, c-format -msgid "Left to... (%1)" +msgid "Left to Right (%1 of %2)" msgstr "" #: Merge.rc:2140 #: Merge.rc:2156 #, c-format -msgid "Right to... (%1)" +msgid "Left to... (%1)" msgstr "" #: Merge.rc:2141 #: Merge.rc:2157 #, c-format -msgid "Left to... (%1 of %2)" +msgid "Right to... (%1)" msgstr "" #: Merge.rc:2142 #: Merge.rc:2158 #, c-format +msgid "Left to... (%1 of %2)" +msgstr "" + +#: Merge.rc:2143 +#: Merge.rc:2159 +#, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2148 +#: Merge.rc:2149 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2149 +#: Merge.rc:2150 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2151 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2152 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2153 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2154 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2154 +#: Merge.rc:2155 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2159 +#: Merge.rc:2160 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2160 +#: Merge.rc:2161 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2161 +#: Merge.rc:2162 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:2163 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2169 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2170 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2171 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2171 +#: Merge.rc:2172 #, c-format msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2178 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2179 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2180 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2180 +#: Merge.rc:2181 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2181 +#: Merge.rc:2182 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2182 +#: Merge.rc:2183 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2183 +#: Merge.rc:2184 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2185 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2186 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2187 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2188 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2188 +#: Merge.rc:2189 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2194 +#: Merge.rc:2195 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:2196 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2197 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2198 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2198 +#: Merge.rc:2199 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2201 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2203 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2208 +#: Merge.rc:2209 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2209 +#: Merge.rc:2210 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2210 +#: Merge.rc:2211 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2212 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2212 +#: Merge.rc:2213 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2213 +#: Merge.rc:2214 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2214 +#: Merge.rc:2215 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2215 +#: Merge.rc:2216 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2217 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2217 +#: Merge.rc:2218 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2224 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2225 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2226 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2227 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2228 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2229 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2230 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2231 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2232 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2233 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2239 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2240 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2241 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2241 +#: Merge.rc:2242 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2242 -#: Merge.rc:2721 +#: Merge.rc:2243 +#: Merge.rc:2722 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2249 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2250 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2250 +#: Merge.rc:2251 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2251 +#: Merge.rc:2252 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2253 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2254 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2255 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2257 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2258 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2259 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2260 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2262 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2268 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2268 +#: Merge.rc:2269 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2270 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2276 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2277 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2278 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2279 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2280 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2280 +#: Merge.rc:2281 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2281 +#: Merge.rc:2282 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2282 +#: Merge.rc:2283 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2284 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2284 +#: Merge.rc:2285 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2291 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2292 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2293 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2293 +#: Merge.rc:2294 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2295 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2295 +#: Merge.rc:2296 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2296 +#: Merge.rc:2297 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2297 +#: Merge.rc:2298 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2299 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2300 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:2306 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2307 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2308 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2308 +#: Merge.rc:2309 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2309 +#: Merge.rc:2310 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2316 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2317 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2318 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:2319 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2319 +#: Merge.rc:2320 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2322 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2323 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2324 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2330 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2331 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2332 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2333 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2334 #, c-format msgid "Binary files cannot be visually compared." msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2335 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2336 #, c-format msgid "Directory files cannot be visually compared." msgstr "" -#: Merge.rc:2336 +#: Merge.rc:2337 #, c-format msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2338 #, c-format msgid "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2339 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2340 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2341 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2347 #, c-format msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2348 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2349 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2349 +#: Merge.rc:2350 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2351 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2357 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2358 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2364 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2365 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2371 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2372 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2378 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2379 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2384 +#: Merge.rc:2385 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2386 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2387 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2388 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2389 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2390 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2391 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2391 +#: Merge.rc:2392 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2393 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2393 +#: Merge.rc:2394 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2394 +#: Merge.rc:2395 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2396 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2397 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2397 +#: Merge.rc:2398 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2399 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2404 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2405 #, c-format msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2406 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2407 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2407 +#: Merge.rc:2408 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2409 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2410 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2411 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2412 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2413 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2413 +#: Merge.rc:2414 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2420 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2421 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2422 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2423 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2424 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2425 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2426 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2427 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2428 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2429 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2429 +#: Merge.rc:2430 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2431 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2432 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2433 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2434 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2435 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2440 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2446 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2447 #, c-format msgid "Albanian" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2448 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2449 #, c-format msgid "Arabic (Iraq)" msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2450 #, c-format msgid "Arabic (Egyptian)" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2451 #, c-format msgid "Arabic (Libyan)" msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2452 #, c-format msgid "Arabic (Algerian)" msgstr "" -#: Merge.rc:2452 +#: Merge.rc:2453 #, c-format msgid "Arabic (Moroccan)" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2454 #, c-format msgid "Arabic (Tunisian)" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2455 #, c-format msgid "Arabic (Oman)" msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2456 #, c-format msgid "Arabic (Yemen)" msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2457 #, c-format msgid "Arabic (Syrian)" msgstr "" -#: Merge.rc:2457 +#: Merge.rc:2458 #, c-format msgid "Arabic (Jordan)" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2464 #, c-format msgid "Arabic (Lebanon)" msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2465 #, c-format msgid "Arabic (Kuwait)" msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2466 #, c-format msgid "Arabic (UAE)" msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2467 #, c-format msgid "Arabic (Bahrain)" msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2468 #, c-format msgid "Arabic (Qatar)" msgstr "" -#: Merge.rc:2468 +#: Merge.rc:2469 #, c-format msgid "Armenian" msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2470 #, c-format msgid "Azeri (Latin)" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2471 #, c-format msgid "Azeri (Cyrillic)" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2472 #, c-format msgid "Basque" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2473 #, c-format msgid "Belarusian" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2474 #, c-format msgid "Bulgarian" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2475 #, c-format msgid "Catalan" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2476 #, c-format msgid "Chinese (Traditional)" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2477 #, c-format msgid "Chinese (Simplified)" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2478 #, c-format msgid "Chinese (Hong Kong)" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2479 #, c-format msgid "Chinese (Singapore)" msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2485 #, c-format msgid "Chinese (Macau SAR)" msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2486 #, c-format msgid "Croatian" msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2487 #, c-format msgid "Czech" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2488 #, c-format msgid "Dansk" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2489 #, c-format msgid "Dutch" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2490 #, c-format msgid "Dutch (Belgium)" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2491 #, c-format msgid "English (US)" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2492 #, c-format msgid "English (UK)" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2493 #, c-format msgid "English (Australian)" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2494 #, c-format msgid "English (Canadian)" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2495 #, c-format msgid "English (New Zealand)" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2496 #, c-format msgid "English (Irish)" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2497 #, c-format msgid "English (So. African)" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2498 #, c-format msgid "English (Jamaican)" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2499 #, c-format msgid "English (Caribbean)" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2500 #, c-format msgid "English (Belize)" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2506 #, c-format msgid "English (Trinidad)" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2507 #, c-format msgid "English (Zimbabwe)" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2508 #, c-format msgid "English (Philippines)" msgstr "" -#: Merge.rc:2508 +#: Merge.rc:2509 #, c-format msgid "Eesti" msgstr "" -#: Merge.rc:2509 +#: Merge.rc:2510 #, c-format msgid "Faeroese" msgstr "" -#: Merge.rc:2510 +#: Merge.rc:2511 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2511 +#: Merge.rc:2512 #, c-format msgid "Suomi" msgstr "" -#: Merge.rc:2512 +#: Merge.rc:2513 #, c-format msgid "French" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2514 #, c-format msgid "French (Belgique)" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2515 #, c-format msgid "French (Canada)" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2516 #, c-format msgid "French (Switzerland)" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2517 #, c-format msgid "French (Luxembourg)" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2518 #, c-format msgid "French (Monaco)" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2519 #, c-format msgid "Georgian" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2520 #, c-format msgid "German (Germany)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2521 #, c-format msgid "German (Switzerland)" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2527 #, c-format msgid "German (Austria)" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2528 #, c-format msgid "German (Luxembourg)" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2529 #, c-format msgid "German (Liechtenstein)" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2530 #, c-format msgid "Greek" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2531 #, c-format msgid "Hebrew" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2532 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2533 #, c-format msgid "Hungarian" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2534 #, c-format msgid "Icelandic" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2535 #, c-format msgid "Indonesian" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2536 #, c-format msgid "Italian" msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2537 #, c-format msgid "Italian (Swiss)" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2538 #, c-format msgid "Japanese" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2539 #, c-format msgid "Kashmiri (India)" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2540 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2541 #, c-format msgid "Korean" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2542 #, c-format msgid "Korean (Johab)" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2548 #, c-format msgid "Latvian" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2549 #, c-format msgid "Lithuanian" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2550 #, c-format msgid "Malay (Malaysian)" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2551 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2552 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2553 #, c-format msgid "Norwegian (Bokml)" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2554 #, c-format msgid "Norwegian (Nynorsk)" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2555 #, c-format msgid "Polski" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2556 #, c-format msgid "Portugese" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2557 #, c-format msgid "Portugese (Brazil)" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2558 #, c-format msgid "Romanian" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2559 #, c-format msgid "Russian" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2560 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2561 #, c-format msgid "Serbian (Latin)" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2562 #, c-format msgid "Serbian (Cyrillic)" msgstr "" -#: Merge.rc:2562 +#: Merge.rc:2563 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2569 #, c-format msgid "Slovak" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2570 #, c-format msgid "Slovenian" msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2571 #, c-format msgid "Spanish" msgstr "" -#: Merge.rc:2571 +#: Merge.rc:2572 #, c-format msgid "Spanish (Mexican)" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2573 #, c-format msgid "Spanish (Modern)" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2574 #, c-format msgid "Spanish (Guatemala)" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2575 #, c-format msgid "Spanish (Costa Rica)" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2576 #, c-format msgid "Spanish (Panama)" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2577 #, c-format msgid "Spanish (Dominican)" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2578 #, c-format msgid "Spanish (Venezuela)" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2579 #, c-format msgid "Spanish (Colombia)" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:2580 #, c-format msgid "Spanish (Peru)" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:2581 #, c-format msgid "Spanish (Argentina)" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2582 #, c-format msgid "Spanish (Ecuador)" msgstr "" -#: Merge.rc:2582 +#: Merge.rc:2583 #, c-format msgid "Spanish (Chile)" msgstr "" -#: Merge.rc:2583 +#: Merge.rc:2584 #, c-format msgid "Spanish (Uruguay)" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2590 #, c-format msgid "Spanish (Paraguay)" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2591 #, c-format msgid "Spanish (Bolivia)" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2592 #, c-format msgid "Spanish (El Salvador)" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2593 #, c-format msgid "Spanish (Honduras)" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2594 #, c-format msgid "Spanish (Nicaragua)" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2595 #, c-format msgid "Spanish (Puerto Rico)" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2596 #, c-format msgid "Swahili (Kenya)" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2597 #, c-format msgid "Swedish" msgstr "" -#: Merge.rc:2597 +#: Merge.rc:2598 #, c-format msgid "Swedish (Finland)" msgstr "" -#: Merge.rc:2598 +#: Merge.rc:2599 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2600 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2601 #, c-format msgid "Thai" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2602 #, c-format msgid "Turkish" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2603 #, c-format msgid "Ukranian" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2604 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2605 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2611 #, c-format msgid "Uzbek (Latin)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2612 #, c-format msgid "Uzbek (Cyrillic)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2613 #, c-format msgid "Vietnamese" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2619 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2620 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2621 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2622 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2623 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2623 -#: Merge.rc:2633 +#: Merge.rc:2624 +#: Merge.rc:2634 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2630 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2631 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2632 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2633 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2640 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2641 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2647 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2648 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2649 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2650 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2651 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2652 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2653 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2653 +#: Merge.rc:2654 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2655 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2656 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2664 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:2667 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2673 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2674 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2675 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2676 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2676 +#: Merge.rc:2677 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2678 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2679 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2680 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2681 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2682 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2683 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2684 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2685 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2686 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2692 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2693 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2694 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2695 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2695 +#: Merge.rc:2696 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2697 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:2706 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2709 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2710 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2711 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2712 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2718 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2719 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2720 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2720 +#: Merge.rc:2721 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2728 #, c-format msgid " B" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2729 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2729 +#: Merge.rc:2730 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2731 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2732 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2733 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2740 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2741 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2741 +#: Merge.rc:2742 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2742 +#: Merge.rc:2743 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2744 #, c-format msgid "Change left file/dir read-only status" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2745 #, c-format msgid "Change right file/dir read-only status" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2746 #, c-format msgid "Convert EOL to DOS mode" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2747 #, c-format msgid "Convert EOL to UNIX mode" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2748 #, c-format msgid "Convert EOL to MAC mode" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2749 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2750 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2751 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2757 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2758 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2759 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2760 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2761 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2762 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2763 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2764 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2765 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2766 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2772 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2773 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2774 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2775 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2775 +#: Merge.rc:2776 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2776 +#: Merge.rc:2777 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2783 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2784 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2785 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2786 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2787 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2787 +#: Merge.rc:2788 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2788 +#: Merge.rc:2789 #, c-format msgid "Select the current user interfacce language\nLanguage" msgstr "" -#: Merge.rc:2789 +#: Merge.rc:2790 #, c-format msgid "Shows differences inside lines with different color\nShow Line Diff" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2791 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2791 +#: Merge.rc:2792 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2793 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2794 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2795 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2796 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2802 #, c-format msgid "Scroll to the previous difference\nPrev Diff (Alt+Up)" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2803 #, c-format msgid "Scroll to the next difference\nNext Diff (Alt+Down)" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2804 #, c-format msgid "Scroll to the first difference\nFirst Diff (Alt+Home)" msgstr "" -#: Merge.rc:2804 +#: Merge.rc:2805 #, c-format msgid "Scroll to the current difference\nCurrent Diff (Alt+Enter)" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2806 #, c-format msgid "Scroll to the last difference\nLast Diff (Alt+End)" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2807 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2807 +#: Merge.rc:2808 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2809 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2810 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2811 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2812 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2812 +#: Merge.rc:2813 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2813 +#: Merge.rc:2814 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2819 +#: Merge.rc:2820 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2820 +#: Merge.rc:2821 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2822 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2822 +#: Merge.rc:2823 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2828 +#: Merge.rc:2829 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2829 +#: Merge.rc:2830 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2830 +#: Merge.rc:2831 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2831 +#: Merge.rc:2832 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2832 +#: Merge.rc:2833 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2833 +#: Merge.rc:2834 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2834 +#: Merge.rc:2835 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2841 #, c-format msgid "Activates next file visible\nActive next File" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2842 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2847 +#: Merge.rc:2848 #, c-format msgid "Displays the WinMerge User's Guide\nHelp" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2849 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2849 +#: Merge.rc:2850 #, c-format msgid "Display the GNU public license" msgstr "" -#: Merge.rc:2850 +#: Merge.rc:2851 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2851 +#: Merge.rc:2852 #, c-format msgid "Opens WinMerge Help Index\nHelp Index" msgstr "" -#: Merge.rc:2852 +#: Merge.rc:2853 #, c-format msgid "Opens WinMerge Help Search\nHelp Search" msgstr "" -#: Merge.rc:2853 +#: Merge.rc:2854 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2854 +#: Merge.rc:2855 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2860 +#: Merge.rc:2861 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2862 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2862 +#: Merge.rc:2863 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2864 +#: Merge.rc:2865 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2865 +#: Merge.rc:2866 #, c-format msgid "<None>" msgstr "" -#: Merge.rc:2866 +#: Merge.rc:2867 #, c-format msgid "<Automatic>" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2873 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2874 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2874 +#: Merge.rc:2875 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2881 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2882 #, c-format msgid "Display all moved blacks" msgstr "" -#: Merge.rc:2882 +#: Merge.rc:2883 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2883 +#: Merge.rc:2884 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2884 +#: Merge.rc:2885 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2885 +#: Merge.rc:2886 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2891 +#: Merge.rc:2892 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2892 +#: Merge.rc:2893 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2893 +#: Merge.rc:2894 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2900 +#: Merge.rc:2901 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2901 +#: Merge.rc:2902 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2902 +#: Merge.rc:2903 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2903 +#: Merge.rc:2904 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2904 +#: Merge.rc:2905 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2905 +#: Merge.rc:2906 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2906 +#: Merge.rc:2907 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2908 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2909 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2910 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2911 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2912 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2913 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2914 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2915 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2916 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2917 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2918 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2919 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2920 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2921 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2922 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2923 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2924 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2925 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2926 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2927 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2928 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2929 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2930 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2931 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2936 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2937 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2938 #, c-format msgid "Show big toolbar" msgstr "" Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2008-01-27 04:38:29 UTC (rev 4963) +++ trunk/Src/MainFrm.cpp 2008-01-27 11:50:51 UTC (rev 4964) @@ -3500,6 +3500,15 @@ if (SelectFile(Ge... [truncated message content] |