[Winmerge-svn] SF.net SVN: winmerge:[5711] branches/R2_10
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-07-31 19:35:14
|
Revision: 5711 http://winmerge.svn.sourceforge.net/winmerge/?rev=5711&view=rev Author: kimmov Date: 2008-07-31 19:35:03 +0000 (Thu, 31 Jul 2008) Log Message: ----------- PATCH: [ 2026508 ] Add confirmation dialog for move operation Modified Paths: -------------- branches/R2_10/Docs/Users/ChangeLog.txt branches/R2_10/Src/ConfirmFolderCopyDlg.cpp branches/R2_10/Src/ConfirmFolderCopyDlg.h branches/R2_10/Src/DirActions.cpp branches/R2_10/Src/Languages/English.pot branches/R2_10/Src/Merge.rc branches/R2_10/Src/resource.h Modified: branches/R2_10/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-31 11:39:05 UTC (rev 5710) +++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-31 19:35:03 UTC (rev 5711) @@ -15,6 +15,7 @@ Add -u commandline parameter as alternative to -ub (#2029275, #2030359) Remove RCLocalizationHelper plugin (#2029457) Clarify Supercopier caused hang in release notes (#2030040) + Confirmation dialog for move operations (#2026508) BugFix: Use system codepage for paths (#1979429, #2008581) BugFix: ANSI build crash in folder compare (#2010053) BugFix: Add insert/overtype mode indicator to statusbar (#2015174) Modified: branches/R2_10/Src/ConfirmFolderCopyDlg.cpp =================================================================== --- branches/R2_10/Src/ConfirmFolderCopyDlg.cpp 2008-07-31 11:39:05 UTC (rev 5710) +++ branches/R2_10/Src/ConfirmFolderCopyDlg.cpp 2008-07-31 19:35:03 UTC (rev 5711) @@ -81,6 +81,9 @@ CStatic * pIcon = (CStatic *) GetDlgItem(IDC_FLDCONFIRM_ICON); pIcon->SetIcon(icon); + if (!m_caption.IsEmpty()) + SetWindowText(m_caption); + // setup handler for resizing this dialog m_constraint.InitializeCurrentSize(this); // configure how individual controls adjust when dialog resizes Modified: branches/R2_10/Src/ConfirmFolderCopyDlg.h =================================================================== --- branches/R2_10/Src/ConfirmFolderCopyDlg.h 2008-07-31 11:39:05 UTC (rev 5710) +++ branches/R2_10/Src/ConfirmFolderCopyDlg.h 2008-07-31 19:35:03 UTC (rev 5711) @@ -22,6 +22,9 @@ // ID line follows -- this is updated by SVN // $Id$ +#ifndef _CONFIRM_FOLDER_COPY_DLG_H_ +#define _CONFIRM_FOLDER_COPY_DLG_H_ + #include "CMoveConstraint.h" /** @@ -50,9 +53,12 @@ CString m_fromPath; CString m_toText; CString m_toPath; + CString m_caption; afx_msg void OnBnClickedNo(); afx_msg void OnBnClickedYes(); private: prdlg::CMoveConstraint m_constraint; //*< Resizes dialog controls when dialog resized */ }; + +#endif // _CONFIRM_FOLDER_COPY_DLG_H_ Modified: branches/R2_10/Src/DirActions.cpp =================================================================== --- branches/R2_10/Src/DirActions.cpp 2008-07-31 11:39:05 UTC (rev 5710) +++ branches/R2_10/Src/DirActions.cpp 2008-07-31 19:35:03 UTC (rev 5711) @@ -53,6 +53,11 @@ static BOOL ConfirmCopy(int origin, int destination, int count, LPCTSTR src, LPCTSTR dest, BOOL destIsSide); +static BOOL ConfirmMove(int origin, int destination, int count, + LPCTSTR src, LPCTSTR dest, BOOL destIsSide); +static BOOL ConfirmDialog(const String &caption, const String &question, + int origin, int destination, int count, + LPCTSTR src, LPCTSTR dest, BOOL destIsSide); static BOOL CheckPathsExist(LPCTSTR orig, LPCTSTR dest, int allowOrig, int allowDest, CString & failedPath); @@ -69,19 +74,69 @@ * @param [in] src Source path. * @param [in] dest Destination path. * @param [in] destIsSide Is destination path either of compare sides? - * @return IDYES if copy should proceed, IDNO if aborted. + * @return TRUE if copy should proceed, FALSE if aborted. */ static BOOL ConfirmCopy(int origin, int destination, int count, LPCTSTR src, LPCTSTR dest, BOOL destIsSide) { + CString strQuestion; + String caption = LoadResString(IDS_CONFIRM_COPY_CAPTION); + UINT id = count == 1 ? IDS_CONFIRM_SINGLE_COPY : IDS_CONFIRM_MULTIPLE_COPY; + strQuestion.Format(theApp.LoadString(id).c_str(), count); + + BOOL ret = ConfirmDialog(caption, (LPCTSTR)strQuestion, origin, + destination, count, src, dest, destIsSide); + return ret; +} + +/** + * @brief Ask user a confirmation for moving item(s). + * Shows a confirmation dialog for move operation. Depending ont item count + * dialog shows full paths to items (single item) or base paths of compare + * (multiple items). + * @param [in] origin Origin side of the item(s). + * @param [in] destination Destination side of the item(s). + * @param [in] count Number of items. + * @param [in] src Source path. + * @param [in] dest Destination path. + * @param [in] destIsSide Is destination path either of compare sides? + * @return TRUE if copy should proceed, FALSE if aborted. + */ +static BOOL ConfirmMove(int origin, int destination, int count, + LPCTSTR src, LPCTSTR dest, BOOL destIsSide) +{ + CString strQuestion; + String caption = LoadResString(IDS_CONFIRM_MOVE_CAPTION); + UINT id = count == 1 ? IDS_CONFIRM_SINGLE_MOVE : IDS_CONFIRM_MULTIPLE_MOVE; + strQuestion.Format(theApp.LoadString(id).c_str(), count); + + BOOL ret = ConfirmDialog(caption, (LPCTSTR)strQuestion, origin, + destination, count, src, dest, destIsSide); + return ret; +} + +/** + * @brief Show a (copy/move) confirmation dialog. + * @param [in] caption Caption of the dialog. + * @param [in] question Guestion to ask from user. + * @param [in] origin Origin side of the item(s). + * @param [in] destination Destination side of the item(s). + * @param [in] count Number of items. + * @param [in] src Source path. + * @param [in] dest Destination path. + * @param [in] destIsSide Is destination path either of compare sides? + * @return TRUE if copy should proceed, FALSE if aborted. + */ +static BOOL ConfirmDialog(const String &caption, const String &question, + int origin, int destination, int count, + LPCTSTR src, LPCTSTR dest, BOOL destIsSide) +{ ConfirmFolderCopyDlg dlg; - CString strQuestion; String sOrig; String sDest; - - UINT id = count == 1 ? IDS_CONFIRM_SINGLE_COPY : IDS_CONFIRM_MULTIPLE_COPY; - strQuestion.Format(theApp.LoadString(id).c_str(), count); + dlg.m_caption = caption.c_str(); + if (origin == FileActionItem::UI_LEFT) sOrig = theApp.LoadString(IDS_FROM_LEFT); else @@ -114,7 +169,7 @@ strDest += _T("\\"); } - dlg.m_question = strQuestion; + dlg.m_question = question.c_str(); dlg.m_fromText = sOrig.c_str(); dlg.m_toText = sDest.c_str(); dlg.m_fromPath = strSrc.c_str(); @@ -677,6 +732,7 @@ FileActionItem act; CString sFullDest(destPath); sFullDest += _T("\\"); + actionScript.m_destBase = sFullDest; if (GetDocument()->GetRecursive()) { if (!di.left.path.empty()) @@ -744,6 +800,7 @@ FileActionItem act; CString sFullDest(destPath); sFullDest += _T("\\"); + actionScript.m_destBase = sFullDest; if (GetDocument()->GetRecursive()) { if (!di.right.path.empty()) @@ -809,7 +866,7 @@ if (actionList.GetActionItemCount() == 1) { if (!ConfirmCopy(item.UIOrigin, item.UIDestination, - actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(), + actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(), bDestIsSide)) { return FALSE; @@ -837,8 +894,7 @@ if (!actionList.m_destBase.empty()) dst = actionList.m_destBase; else - item.dest; - + dst = item.dest; } if (!ConfirmCopy(item.UIOrigin, item.UIDestination, @@ -851,8 +907,40 @@ // Deleting does not need confirmation, CShellFileOp takes care of it case FileAction::ACT_DEL: - // Moving does not need confirmation, CShellFileOp takes care of it + break; + case FileAction::ACT_MOVE: + bDestIsSide = FALSE; + if (actionList.GetActionItemCount() == 1) + { + if (!ConfirmMove(item.UIOrigin, item.UIDestination, + actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(), + bDestIsSide)) + { + return FALSE; + } + } + else + { + String src; + String dst; + + if (item.UIOrigin == FileActionItem::UI_LEFT) + src = GetDocument()->GetLeftBasePath(); + else + src = GetDocument()->GetRightBasePath(); + + if (!actionList.m_destBase.empty()) + dst = actionList.m_destBase; + else + dst = item.dest; + + if (!ConfirmMove(item.UIOrigin, item.UIDestination, + actionList.GetActionItemCount(), src.c_str(), dst.c_str(), bDestIsSide)) + { + return FALSE; + } + } break; // Invalid operation Modified: branches/R2_10/Src/Languages/English.pot =================================================================== --- branches/R2_10/Src/Languages/English.pot 2008-07-31 11:39:05 UTC (rev 5710) +++ branches/R2_10/Src/Languages/English.pot 2008-07-31 19:35:03 UTC (rev 5711) @@ -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-07-29 08:45+0000\n" +"POT-Creation-Date: 2008-07-31 22:33+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -701,7 +701,7 @@ msgstr "" #: Merge.rc:366 -#: Merge.rc:2746 +#: Merge.rc:2750 #, c-format msgid "< Empty >" msgstr "" @@ -2306,7 +2306,7 @@ msgstr "" #: Merge.rc:1476 -#: Merge.rc:2304 +#: Merge.rc:2308 #, c-format msgid "Different" msgstr "" @@ -2338,7 +2338,7 @@ msgstr "" #: Merge.rc:1494 -#: Merge.rc:2299 +#: Merge.rc:2303 #, c-format msgid "Identical" msgstr "" @@ -2528,6 +2528,7 @@ msgstr "" #: Merge.rc:1639 +#: Merge.rc:2218 #, c-format msgid "Confirm Copy" msgstr "" @@ -3146,7 +3147,7 @@ msgstr "" #: Merge.rc:2006 -#: Merge.rc:2610 +#: Merge.rc:2614 #, c-format msgid "Name" msgstr "" @@ -3167,7 +3168,7 @@ msgstr "" #: Merge.rc:2010 -#: Merge.rc:2612 +#: Merge.rc:2616 #, c-format msgid "Description" msgstr "" @@ -3554,8 +3555,8 @@ msgstr "" #: Merge.rc:2159 -#: Merge.rc:2594 -#: Merge.rc:2782 +#: Merge.rc:2598 +#: Merge.rc:2786 #, c-format msgid "None" msgstr "" @@ -3736,1784 +3737,1799 @@ msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." msgstr "" -#: Merge.rc:2221 +#: Merge.rc:2216 #, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2217 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2225 +#, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2226 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2227 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2228 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2229 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2230 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2231 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2232 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2233 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2234 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2235 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2236 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2242 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2243 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2244 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2241 +#: Merge.rc:2245 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2242 +#: Merge.rc:2246 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2244 +#: Merge.rc:2248 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2250 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2256 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2257 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2258 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2259 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2260 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2261 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2262 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2263 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2264 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2265 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2271 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2268 +#: Merge.rc:2272 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2273 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2274 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2271 +#: Merge.rc:2275 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2272 +#: Merge.rc:2276 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2273 +#: Merge.rc:2277 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2274 +#: Merge.rc:2278 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2279 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2280 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2282 +#: Merge.rc:2286 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2287 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2284 +#: Merge.rc:2288 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2285 +#: Merge.rc:2289 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2286 -#: Merge.rc:2590 +#: Merge.rc:2290 +#: Merge.rc:2594 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2296 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2293 +#: Merge.rc:2297 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2298 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2295 +#: Merge.rc:2299 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2296 +#: Merge.rc:2300 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2297 +#: Merge.rc:2301 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2302 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2304 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2301 +#: Merge.rc:2305 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2302 +#: Merge.rc:2306 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:2307 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:2309 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2315 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2316 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2317 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2319 +#: Merge.rc:2323 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2320 +#: Merge.rc:2324 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2325 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2326 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2327 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2328 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2329 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2330 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2331 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2328 +#: Merge.rc:2332 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2338 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2339 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2336 +#: Merge.rc:2340 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2341 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2342 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2343 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2344 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2341 +#: Merge.rc:2345 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2342 +#: Merge.rc:2346 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2343 +#: Merge.rc:2347 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2349 +#: Merge.rc:2353 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2354 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2351 +#: Merge.rc:2355 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2356 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2357 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2363 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2360 +#: Merge.rc:2364 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2365 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2366 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2367 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2369 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2370 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2367 +#: Merge.rc:2371 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2373 +#: Merge.rc:2377 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2378 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2375 +#: Merge.rc:2379 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2376 +#: Merge.rc:2380 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2381 #, 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:2378 +#: Merge.rc:2382 #, c-format msgid "The EOL are of different types (Windows/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:2379 +#: Merge.rc:2383 #, 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:2380 +#: Merge.rc:2384 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2385 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2382 +#: Merge.rc:2386 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2392 #, 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:2389 +#: Merge.rc:2393 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2394 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2391 +#: Merge.rc:2395 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2402 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2403 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2409 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2410 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2416 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:2417 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2423 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2424 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2430 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2431 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2432 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2429 +#: Merge.rc:2433 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2434 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2435 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2436 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2437 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2438 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2439 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2440 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2441 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2442 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2443 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2444 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2449 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2450 #, 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:2447 +#: Merge.rc:2451 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2452 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2453 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2454 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2455 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2452 +#: Merge.rc:2456 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2457 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2458 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2459 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2465 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2466 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2467 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2468 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2469 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2470 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2471 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2468 +#: Merge.rc:2472 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2473 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2474 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2475 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2476 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2477 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2478 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2479 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2480 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2485 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2491 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2492 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2493 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2494 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2495 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2492 -#: Merge.rc:2502 +#: Merge.rc:2496 +#: Merge.rc:2506 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2502 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2503 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2504 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2505 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2508 +#: Merge.rc:2512 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2509 +#: Merge.rc:2513 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2519 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2520 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2534 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2535 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2536 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2538 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2545 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2546 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2547 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2548 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2549 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2550 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2551 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2553 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2555 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2556 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2557 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2558 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2564 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2565 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2562 +#: Merge.rc:2566 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2567 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2568 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2569 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2578 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2581 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2582 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2590 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2591 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2588 +#: Merge.rc:2592 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2593 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2595 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2596 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2597 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2604 #, c-format msgid " B" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2605 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2606 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2607 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2608 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2609 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2615 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2617 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2618 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2619 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2626 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2627 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2628 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2629 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2630 #, c-format msgid "Change left side file/folder read-only status" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2631 #, c-format msgid "Change right side file/folder read-only status" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2632 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2633 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2635 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2636 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2637 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2643 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2644 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2645 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2646 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2647 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2648 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2649 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2650 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2651 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2652 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2658 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2659 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2660 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2661 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2662 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2663 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2669 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:2670 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:2671 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:2672 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2673 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2674 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2675 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2676 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2677 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2678 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2679 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2676 +#: Merge.rc:2680 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2681 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2682 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2683 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2689 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2690 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2691 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2692 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2693 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2694 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2695 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2696 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2697 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2698 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:2699 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2700 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2701 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2707 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2708 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:2709 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2710 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2716 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2717 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2714 +#: Merge.rc:2718 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2715 +#: Merge.rc:2719 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2720 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2721 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2722 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2723 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2729 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2730 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2736 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2737 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2734 +#: Merge.rc:2738 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2739 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2740 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2741 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2747 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2748 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2749 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2751 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2752 #, c-format msgid "<None>" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2753 #, c-format msgid "<Automatic>" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2759 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2760 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2761 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2767 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2768 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2769 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2770 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2771 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2772 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2778 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2775 +#: Merge.rc:2779 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2776 +#: Merge.rc:2780 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2787 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2788 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2789 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2790 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2787 +#: Merge.rc:2791 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2788 +#: Merge.rc:2792 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2789 +#: Merge.rc:2793 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2794 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2791 +#: Merge.rc:2795 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2796 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2797 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2798 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2799 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2800 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2797 +#: Merge.rc:2801 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2802 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2803 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2804 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2805 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2806 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2807 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2804 +#: Merge.rc:2808 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2809 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2810 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2807 +#: Merge.rc:2811 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2812 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2813 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2814 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2815 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2812 +#: Merge.rc:2816 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2813 +#: Merge.rc:2817 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2818 +#: Merge.rc:2822 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2819 +#: Merge.rc:2823 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2820 +#: Merge.rc:2824 #, c-format msgid "Show big toolbar" msgstr "" Modified: branches/R2_10/Src/Merge.rc =================================================================== --- branches/R2_10/Src/Merge.rc 2008-07-31 11:39:05 UTC (rev 5710) +++ branches/R2_10/Src/Merge.rc 2008-07-31 19:35:03 UTC (rev 5711) @@ -2213,6 +2213,10 @@ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:" IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:" IDS_DIRCMP_NOTSYNC "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." + IDS_CONFIRM_SINGLE_MOVE "Are you sure you want to move:" + IDS_CONFIRM_MULTIPLE_MOVE "Are you sure you want to move %d items:" + IDS_CONFIRM_COPY_CAPTION "Confirm Copy" + IDS_CONFIRM_MOVE_CAPTION "Confirm Move" END // DIRECTORY DIFFING : OPEN FILE Modified: branches/R2_10/Src/resource.h =================================================================== --- branches/R2_10/Src/resource.h 2008-07-31 11:39:05 UTC (rev 5710) +++ branches/R2_10/Src/resource.h 2008-07-31 19:35:03 UTC (rev 5711) @@ -617,6 +617,10 @@ #define IDS_CONFIRM_SINGLE_COPY 17639 #define IDS_CONFIRM_MULTIPLE_COPY 17640 #define IDS_DIRCMP_NOTSYNC 17641 +#define IDS_CONFIRM_SINGLE_MOVE 17642 +#define IDS_CONFIRM_MULTIPLE_MOVE 17643 +#define IDS_CONFIRM_COPY_CAPTION 17644 +#define IDS_CONFIRM_MOVE_CAPTION 17645 #define ID_DIR_OPEN_LEFT 17648 #define ID_DIR_OPEN_LEFT_WITHEDITOR 17649 #define ID_DIR_OPEN_LEFT_WITH 17650 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |